Revert "Merge branch 'hdf5_1_12' of https://bitbucket.hdfgroup.org/scm/hdffv/hdf5 into hdf5_1_12"

This reverts commit 9f9336a5bd541752f472bab4c93da8de89f862cd, reversing
changes made to 437a1919e7ba60fe75a33a466d264183a0255319.

1 files changed, 2 insertions, 19 deletions

diff --git a/src/H5private.h b/src/H5private.h
index 2b35bd4..0bfc91b 100644
--- a/src/H5private.h
+++ b/src/H5private.h
@@ -345,14 +345,6 @@
 #define FAIL    (-1)
 #define UFAIL    (unsigned)(-1)
 
-/* The HDF5 library uses the symbol `ERR` frequently.  So do
- * header files for libraries such as curses(3), terminfo(3), etc.
- * Remove its definition here to avoid clashes with HDF5.
- */
-#ifdef ERR
-#undef ERR
-#endif
-
 /* number of members in an array */
 #ifndef NELMTS
 #    define NELMTS(X)    (sizeof(X)/sizeof(X[0]))
@@ -1653,18 +1645,9 @@ extern char *strdup(const char *s);
 
 /* Assign a variable to one of a different size (think safer dst = (dsttype)src").
  * The code generated by the macro checks for overflows.
- *
- * Use w##x##y##z instead of H5_GLUE4(w, x, y, z) because srctype
- * or dsttype on some systems (e.g., NetBSD 8 and earlier) may
- * supply some standard types using a macro---e.g.,
- * #define uint8_t __uint8_t.  The preprocessor will expand the
- * macros before it evaluates H5_GLUE4(), and that will generate
- * an unexpected name such as ASSIGN___uint8_t_TO___uint16_t.
- * The preprocessor does not expand macros in w##x##y##z, so
- * that will always generate the expected name.
  */
 #define H5_CHECKED_ASSIGN(dst, dsttype, src, srctype)  \
-    ASSIGN_##srctype##_TO_##dsttype(dst,dsttype,src,srctype)\
+    H5_GLUE4(ASSIGN_,srctype,_TO_,dsttype)(dst,dsttype,src,srctype)\
 
 #else /* NDEBUG */
 #define H5_CHECKED_ASSIGN(dst, dsttype, src, srctype)  \
@@ -2688,7 +2671,7 @@ H5_DLL herr_t   H5_combine_path(const char *path1, const char *path2, char **ful
 #ifdef H5_HAVE_PARALLEL
 /* Generic MPI functions */
 H5_DLL hsize_t  H5_mpi_set_bigio_count(hsize_t new_count);
-H5_DLL hsize_t  H5_mpi_get_bigio_count(void);
+H5_DLL hsize_t  H5_mpi_get_bigio_count();
 H5_DLL herr_t   H5_mpi_comm_dup(MPI_Comm comm, MPI_Comm *comm_new);
 H5_DLL herr_t   H5_mpi_info_dup(MPI_Info info, MPI_Info *info_new);
 H5_DLL herr_t   H5_mpi_comm_free(MPI_Comm *comm);