Commit da19d9fb authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

Fix use of reserved macro name.

parent e8c7e0fb
...@@ -41,7 +41,7 @@ char *strdup(const char *s); ...@@ -41,7 +41,7 @@ char *strdup(const char *s);
#endif #endif
#ifndef _ERROR_H #ifndef ERROR_H
# include "error.h" # include "error.h"
#endif #endif
#ifndef _BASETIME_H #ifndef _BASETIME_H
......
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
#if ! defined (_CGRIBEX_H) #if ! defined (_CGRIBEX_H)
# include "cgribex.h" # include "cgribex.h"
#endif #endif
#if ! defined (_ERROR_H) #if ! defined (ERROR_H)
# include "error.h" # include "error.h"
#endif #endif
#if ! defined (_DTYPES_H) #if ! defined (_DTYPES_H)
......
#ifndef _ERROR_H #ifndef ERROR_H
#define _ERROR_H #define ERROR_H
#include <stdarg.h> #include <stdarg.h>
#include <stdlib.h> #include <stdlib.h>
...@@ -70,7 +70,7 @@ cdiAbortC_serial(const char *caller, const char *filename, ...@@ -70,7 +70,7 @@ cdiAbortC_serial(const char *caller, const char *filename,
} }
#endif #endif
#endif /* _ERROR_H */ #endif /* ERROR_H */
/* /*
* Local Variables: * Local Variables:
* c-file-style: "Java" * c-file-style: "Java"
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
#ifdef HAVE_LIBGRIB_API #ifdef HAVE_LIBGRIB_API
#include <grib_api.h> #include <grib_api.h>
#ifndef _ERROR_H #ifndef ERROR_H
#include "error.h" #include "error.h"
#endif #endif
#endif #endif
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
#include <mpi.h> #include <mpi.h>
#ifndef _ERROR_H #ifndef ERROR_H
#include "error.h" #include "error.h"
#endif #endif
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
#ifndef CDI_CKSUM_H_ #ifndef CDI_CKSUM_H_
#include "cdi_cksum.h" #include "cdi_cksum.h"
#endif #endif
#ifndef _ERROR_H #ifndef ERROR_H
#include "error.h" #include "error.h"
#endif #endif
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#include "config.h" #include "config.h"
#endif #endif
#ifndef _ERROR_H #ifndef ERROR_H
#include "error.h" #include "error.h"
#endif #endif
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment