Brings include guard changes from develop

8 files changed, 23 insertions, 23 deletions

diff --git a/src/H5CXprivate.h b/src/H5CXprivate.h
index 53d49a9..36d8c1c 100644
--- a/src/H5CXprivate.h
+++ b/src/H5CXprivate.h
@@ -61,10 +61,10 @@ typedef struct H5CX_state_t {
 /***************************************/
 
 /* Library private routines */
-#ifndef _H5private_H
+#ifndef H5private_H
 H5_DLL herr_t H5CX_push(void);
 H5_DLL herr_t H5CX_pop(void);
-#endif /* _H5private_H */
+#endif /* H5private_H */
 H5_DLL void    H5CX_push_special(void);
 H5_DLL hbool_t H5CX_is_def_dxpl(void);
 
diff --git a/src/H5Epublic.h b/src/H5Epublic.h
index 403bee7..bec92d6 100644
--- a/src/H5Epublic.h
+++ b/src/H5Epublic.h
@@ -42,11 +42,11 @@ typedef struct H5E_error2_t {
 
 /* When this header is included from a private header, don't make calls to H5open() */
 #undef H5OPEN
-#ifndef _H5private_H
+#ifndef H5private_H
 #define H5OPEN H5open(),
-#else /* _H5private_H */
+#else /* H5private_H */
 #define H5OPEN
-#endif /* _H5private_H */
+#endif /* H5private_H */
 
 /* HDF5 error class */
 #define H5E_ERR_CLS (H5OPEN H5E_ERR_CLS_g)
diff --git a/src/H5FDmulti.c b/src/H5FDmulti.c
index a5a38a6..e71f450 100644
--- a/src/H5FDmulti.c
+++ b/src/H5FDmulti.c
@@ -2011,7 +2011,7 @@ open_members(H5FD_multi_t *file)
 }
 H5_GCC_DIAG_ON("format-nonliteral")
 
-#ifdef _H5private_H
+#ifdef H5private_H
 /*
  * This is not related to the functionality of the driver code.
  * It is added here to trigger warning if HDF5 private definitions are included
diff --git a/src/H5FDstdio.c b/src/H5FDstdio.c
index aaa84ee..230f5e1 100644
--- a/src/H5FDstdio.c
+++ b/src/H5FDstdio.c
@@ -1201,7 +1201,7 @@ H5FD_stdio_unlock(H5FD_t *_file)
     return 0;
 } /* end H5FD_stdio_unlock() */
 
-#ifdef _H5private_H
+#ifdef H5private_H
 /*
  * This is not related to the functionality of the driver code.
  * It is added here to trigger warning if HDF5 private definitions are included
diff --git a/src/H5Fpublic.h b/src/H5Fpublic.h
index 139ab89..86b8170 100644
--- a/src/H5Fpublic.h
+++ b/src/H5Fpublic.h
@@ -24,19 +24,19 @@
 
 /* When this header is included from a private header, don't make calls to H5check() */
 #undef H5CHECK
-#ifndef _H5private_H
+#ifndef H5private_H
 #define H5CHECK H5check(),
-#else /* _H5private_H */
+#else /* H5private_H */
 #define H5CHECK
-#endif /* _H5private_H */
+#endif /* H5private_H */
 
 /* When this header is included from a private HDF5 header, don't make calls to H5open() */
 #undef H5OPEN
-#ifndef _H5private_H
+#ifndef H5private_H
 #define H5OPEN H5open(),
-#else /* _H5private_H */
+#else /* H5private_H */
 #define H5OPEN
-#endif /* _H5private_H */
+#endif /* H5private_H */
 
 /*
  * These are the bits that can be passed to the `flags' argument of
diff --git a/src/H5Ppublic.h b/src/H5Ppublic.h
index 9524dca..f2c3830 100644
--- a/src/H5Ppublic.h
+++ b/src/H5Ppublic.h
@@ -39,11 +39,11 @@
 
 /* When this header is included from a private HDF5 header, don't make calls to H5open() */
 #undef H5OPEN
-#ifndef _H5private_H
+#ifndef H5private_H
 #define H5OPEN H5open(),
-#else /* _H5private_H */
+#else /* H5private_H */
 #define H5OPEN
-#endif /* _H5private_H */
+#endif /* H5private_H */
 
 /*
  * The library's property list classes
diff --git a/src/H5Tpublic.h b/src/H5Tpublic.h
index 9f77f62..931aec8 100644
--- a/src/H5Tpublic.h
+++ b/src/H5Tpublic.h
@@ -217,11 +217,11 @@ typedef H5T_conv_ret_t (*H5T_conv_except_func_t)(H5T_conv_except_t except_type,
 
 /* When this header is included from a private header, don't make calls to H5open() */
 #undef H5OPEN
-#ifndef _H5private_H
+#ifndef H5private_H
 #define H5OPEN H5open(),
-#else /* _H5private_H */
+#else /* H5private_H */
 #define H5OPEN
-#endif /* _H5private_H */
+#endif /* H5private_H */
 
 /*
  * The IEEE floating point types in various byte orders.
diff --git a/src/H5private.h b/src/H5private.h
index 49ffbcb..683781b 100644
--- a/src/H5private.h
+++ b/src/H5private.h
@@ -11,7 +11,7 @@
  * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-/* Programmer:  Robb Matzke <matzke@llnl.gov>
+/* Programmer:  Robb Matzke
  *    Friday, October 30, 1998
  *
  * Purpose:  This file is included by all HDF5 library source files to
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef _H5private_H
-#define _H5private_H
+#ifndef H5private_H
+#define H5private_H
 
 #include "H5public.h" /* Include Public Definitions    */
 
@@ -2912,4 +2912,4 @@ H5_DLL herr_t  H5_mpio_create_large_type(hsize_t num_elements, MPI_Aint stride_b
 H5_DLL herr_t H5_buffer_dump(FILE *stream, int indent, const uint8_t *buf, const uint8_t *marker,
                              size_t buf_offset, size_t buf_size);
 
-#endif /* _H5private_H */
+#endif /* H5private_H */