diff options
| author | Dana Robinson <43805+derobins@users.noreply.github.com> | 2022-04-07 14:37:08 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-07 14:37:08 (GMT) |
| commit | a4e833c50c002239af8c16667b1b072e6c6fa27f (patch) | |
| tree | a9a5a7a595f4291f973e5783716e4e2499edd031 /src | |
| parent | dc07ef19fd055daa27026282213c63e7e74f73c2 (diff) | |
| download | hdf5-a4e833c50c002239af8c16667b1b072e6c6fa27f.zip hdf5-a4e833c50c002239af8c16667b1b072e6c6fa27f.tar.gz hdf5-a4e833c50c002239af8c16667b1b072e6c6fa27f.tar.bz2 | |
1.12: Brings 1.12 compiler options in line with develop (#1611)
* Brings 1.12 compiler options in line with develop
* Revert 'since' doxygen field in H5public.h
Diffstat (limited to 'src')
| -rw-r--r-- | src/H5private.h | 4 | ||||
| -rw-r--r-- | src/H5public.h | 14 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/H5private.h b/src/H5private.h index b560d62..1ea172a 100644 --- a/src/H5private.h +++ b/src/H5private.h @@ -166,8 +166,8 @@ #include <dirent.h> #endif -/* Define the default VFD for this platform. - * Since the removal of the Windows VFD, this is sec2 for all platforms. +/* Define the default VFD for this platform. Since the removal of the + * Windows VFD, this is sec2 for all platforms. */ #define H5_DEFAULT_VFD H5FD_SEC2 diff --git a/src/H5public.h b/src/H5public.h index 87a282c..f7b27fc 100644 --- a/src/H5public.h +++ b/src/H5public.h @@ -71,13 +71,6 @@ #endif #endif -/* Include the Windows API adapter header early */ -#include "H5api_adpt.h" - -#ifdef __cplusplus -extern "C" { -#endif - /* Macros for enabling/disabling particular GCC warnings */ /* (see the following web-sites for more info: * http://www.dbp-consulting.com/tutorials/SuppressingGCCWarnings.html @@ -485,6 +478,13 @@ typedef struct H5_alloc_stats_t { size_t peak_alloc_blocks_count; /**< Peak # of blocks allocated */ } H5_alloc_stats_t; +/* API adapter header (defines H5_DLL, etc.) */ +#include "H5api_adpt.h" + +#ifdef __cplusplus +extern "C" { +#endif + /* Functions in H5.c */ /** * \ingroup H5 |