diff options
| author | David Young <dyoung@hdfgroup.org> | 2020-09-27 20:03:44 (GMT) |
|---|---|---|
| committer | David Young <dyoung@hdfgroup.org> | 2020-09-27 20:03:44 (GMT) |
| commit | 08034972bc4818e8550445aa7f4fd0b315800190 (patch) | |
| tree | 14ab13613f3c411d0b3248455244f29418ef887b /src/H5public.h | |
| parent | d20e1274a7bbf8ab1f87f3ebd61cea82ac8caf53 (diff) | |
| parent | aa08db839e6aea89487be985704d57a0e424b21b (diff) | |
| download | hdf5-08034972bc4818e8550445aa7f4fd0b315800190.zip hdf5-08034972bc4818e8550445aa7f4fd0b315800190.tar.gz hdf5-08034972bc4818e8550445aa7f4fd0b315800190.tar.bz2 | |
Merge remote-tracking branch 'hdffv/develop' into rebased-fprintf-experiment
Diffstat (limited to 'src/H5public.h')
| -rw-r--r-- | src/H5public.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/H5public.h b/src/H5public.h index 97176ab..5216906 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) |