summaryrefslogtreecommitdiffstats
path: root/src/H5public.h
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2020-09-04 21:51:30 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2020-09-04 21:51:30 (GMT)
commitd8d17d23284d29048da7af67c9653ffc2d0945c4 (patch)
tree916b9b1144be81df0b25a2ea712f8e6ac6e8e040 /src/H5public.h
parent30c7264c2ca0f169b099b6ebbf13c5bd71652ebc (diff)
downloadhdf5-d8d17d23284d29048da7af67c9653ffc2d0945c4.zip
hdf5-d8d17d23284d29048da7af67c9653ffc2d0945c4.tar.gz
hdf5-d8d17d23284d29048da7af67c9653ffc2d0945c4.tar.bz2
File changes to affect formatting
Diffstat (limited to 'src/H5public.h')
-rw-r--r--src/H5public.h13
1 files changed, 6 insertions, 7 deletions
diff --git a/src/H5public.h b/src/H5public.h
index ba2505a..249cc1d 100644
--- a/src/H5public.h
+++ b/src/H5public.h
@@ -81,12 +81,11 @@ extern "C" {
*/
/* These pragmas are only implemented usefully in gcc 4.6+ */
#if ((__GNUC__ * 100) + __GNUC_MINOR__) >= 406
- #define H5_GCC_DIAG_STR(s) #s
- #define H5_GCC_DIAG_JOINSTR(x,y) H5_GCC_DIAG_STR(x ## y)
- #define H5_GCC_DIAG_DO_PRAGMA(x) _Pragma (#x)
- #define H5_GCC_DIAG_PRAGMA(x) H5_GCC_DIAG_DO_PRAGMA(GCC diagnostic x)
+ #define H5_GCC_DIAG_JOINSTR(x, y) x y
+ #define H5_GCC_DIAG_DO_PRAGMA(x) _Pragma(#x)
+ #define H5_GCC_DIAG_PRAGMA(x) H5_GCC_DIAG_DO_PRAGMA(GCC diagnostic x)
- #define H5_GCC_DIAG_OFF(x) H5_GCC_DIAG_PRAGMA(push) H5_GCC_DIAG_PRAGMA(ignored H5_GCC_DIAG_JOINSTR(-W,x))
+ #define H5_GCC_DIAG_OFF(x) H5_GCC_DIAG_PRAGMA(push) H5_GCC_DIAG_PRAGMA(ignored H5_GCC_DIAG_JOINSTR("-W",x))
#define H5_GCC_DIAG_ON(x) H5_GCC_DIAG_PRAGMA(pop)
#else
#define H5_GCC_DIAG_OFF(x)
@@ -182,10 +181,10 @@ typedef long long ssize_t;
* type.
*/
#if H5_SIZEOF_LONG_LONG >= 8
-H5_GCC_DIAG_OFF(long-long)
+H5_GCC_DIAG_OFF("long-long")
typedef unsigned long long hsize_t;
typedef signed long long hssize_t;
-H5_GCC_DIAG_ON(long-long)
+H5_GCC_DIAG_ON("long-long")
# define H5_SIZEOF_HSIZE_T H5_SIZEOF_LONG_LONG
# define H5_SIZEOF_HSSIZE_T H5_SIZEOF_LONG_LONG
#else