diff options
| author | Dana Robinson <43805+derobins@users.noreply.github.com> | 2021-07-06 17:39:15 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-06 17:39:15 (GMT) |
| commit | 8e2fc4a2e2325a006d42b1df5c339549cdd2cb94 (patch) | |
| tree | a8e9ba199a98b20bb66142af1f4efd751119ea81 /src/H5private.h | |
| parent | 257c8c745446ee614f92624b30cec41d8d771e05 (diff) | |
| download | hdf5-8e2fc4a2e2325a006d42b1df5c339549cdd2cb94.zip hdf5-8e2fc4a2e2325a006d42b1df5c339549cdd2cb94.tar.gz hdf5-8e2fc4a2e2325a006d42b1df5c339549cdd2cb94.tar.bz2 | |
Remove checks for winsock2.h (#813)
This is only needed on Windows and always available, so there's no need
to check for it.
Diffstat (limited to 'src/H5private.h')
| -rw-r--r-- | src/H5private.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/H5private.h b/src/H5private.h index a5c6efd..f29ec02 100644 --- a/src/H5private.h +++ b/src/H5private.h @@ -106,22 +106,21 @@ #define H5_DEFAULT_VOL H5VL_NATIVE #ifdef H5_HAVE_WIN32_API + /* The following two defines must be before any windows headers are included */ #define WIN32_LEAN_AND_MEAN /* Exclude rarely-used stuff from Windows headers */ #define NOGDI /* Exclude Graphic Display Interface macros */ -#ifdef H5_HAVE_WINSOCK2_H -#include <winsock2.h> -#endif +#include <windows.h> + +#include <direct.h> /* For _getcwd() */ +#include <io.h> /* POSIX I/O */ +#include <winsock2.h> /* For GetUserName() */ #ifdef H5_HAVE_THREADSAFE #include <process.h> /* For _beginthread() */ #endif -#include <windows.h> -#include <direct.h> /* For _getcwd() */ -#include <io.h> /* POSIX I/O */ - #endif /*H5_HAVE_WIN32_API*/ #ifndef F_OK |