cdilib.c: prevent include of include files if they are already included

src/gribapi.h

@@ -2,11 +2,15 @@
 #define _GRIBAPI_H
 
 #ifdef HAVE_LIBGRIB_API
-#  include "error.h"
-#  include <grib_api.h>
+#include <grib_api.h>
+#ifndef  _ERROR_H
+#include "error.h"
+#endif
 #endif
 
+#ifndef  _CDI_INT_H
 #include "cdi_int.h"
+#endif
 
 #define  GRIBAPI_MISSVAL  -9.E33
 

src/grid.h

@@ -2,7 +2,9 @@
 #define _GRID_H
 
 #include "cdi.h"
+#ifndef RESOURCE_HANDLE_H
 #include "resource_handle.h"
+#endif
 
 typedef unsigned char mask_t;
 

src/serialize.h

@@ -8,8 +8,12 @@
 #include <string.h>
 
 #include "cdi.h"
+#ifndef  CDI_CKSUM_H_
 #include "cdi_cksum.h"
+#endif
+#ifndef  _ERROR_H
 #include "error.h"
+#endif
 
 /*
  * Generic interfaces for (de-)marshalling

src/stream_fcommon.h

 #ifndef STREAM_FCOMMON_H
 #define STREAM_FCOMMON_H
 
+#ifndef  _CDI_INT_H
 #include "cdi_int.h"
+#endif
 
 enum {
   SINGLE_PRECISION = 4,

src/stream_gribapi.h

 #ifndef _STREAM_GRIBAPI_H
 #define _STREAM_GRIBAPI_H
 
+#ifndef  _CDI_INT_H
 #include "cdi_int.h"
+#endif
 
 int gribapiScanTimestep1(stream_t * streamptr);
 int gribapiScanTimestep2(stream_t * streamptr);

src/vlist.h

@@ -5,12 +5,14 @@
 #include "config.h"
 #endif
 
+#ifndef  _ERROR_H
 #include "error.h"
+#endif
 
 #include <stddef.h>  /* size_t */
 
 #ifndef _CDI_LIMITS_H
-#  include "cdi_limits.h"
+#include "cdi_limits.h"
 #endif
 
 #define VALIDMISS 1.e+303