Fix duplicate macro

Unidata · Jan 30, 2025 · ff78398 · ff78398
1 parent 1547d4b
commit ff78398
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/include/ncjson.h b/include/ncjson.h
@@ -21,7 +21,7 @@
 
 /* Return codes */
 #define NCJ_OK 0 /* must equal NC_NOERR in netcdf.h */
-#define NCJ_ERR (-1) /* must equal NC_ERR in netcdf.h */
+#define NCJ_ERR (-1) /* must equal NC_ERROR in netcdf.h */
 
 /* Json object sorts (note use of term sort rather than e.g. type or discriminant) */
 #define NCJ_UNDEF    0

diff --git a/include/netcdf.h b/include/netcdf.h
@@ -384,7 +384,7 @@ there. */
 /* This is unused, so re-purpose it to generic error */
 #define NC2_ERR         (-1)       /**< Returned for all errors in the v2 API. */
 #else
-#define NC_ERR         (-1)       /**< Returned for generic errors */
+#define NC_ERROR        (-1)       /**< Returned for generic errors */
 #endif
 
 /** Not a netcdf id.

diff --git a/include/netcdf_filter_build.h b/include/netcdf_filter_build.h
@@ -158,7 +158,7 @@ struct NCjson;
 
 /* Test if JSON dict is in raw format.
 @param jraw to test
-@return NCJ_OK if in raw format; NCJ_ERR/NC_ERR otherwise.
+@return NCJ_OK if in raw format; NCJ_ERR/NC_ERROR otherwise.
 */
 #ifndef NCraw_test
 #define NC_RAWTAG "hdf5raw"

diff --git a/libdispatch/derror.c b/libdispatch/derror.c
@@ -100,7 +100,7 @@ const char *nc_strerror(int ncerr1)
    {
       case NC_NOERR:
 	 return "No error";
-      case NC_ERR:
+      case NC_ERROR:
          return "Non-specific error";
       case NC_EBADID:
 	 return "NetCDF: Not a valid ID";