diff options
Diffstat (limited to 'src/H5private.h')
| -rw-r--r-- | src/H5private.h | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/src/H5private.h b/src/H5private.h index 72755a6..1a24d3a 100644 --- a/src/H5private.h +++ b/src/H5private.h @@ -9,9 +9,6 @@ * define common things which are not defined in the HDF5 API. * The configuration constants like H5_HAVE_UNISTD_H etc. are * defined in H5config.h which is included by H5public.h. - * - * Modifications: Pedro Vicente <pvn@ncsa.uiuc.edu>, June 2001 - * WIN32 modifications * */ #ifndef _H5private_H @@ -140,20 +137,8 @@ #ifdef WIN32 -/* - * we need this from <windows.h> - * HDF5 is currently supported on _X86_ - * including <windows.h> has the side effect of introducing thousands of Windows GUI - * macros and type declarations to the compilation environment, so we don't include it - */ - -#if !defined(_68K_) && !defined(_MPPC_) && !defined(_PPC_) && !defined(_ALPHA_) && !defined(_MIPS_) && !defined(_X86_) && defined(_M_IX86) -#define _X86_ -#endif - -#include <windef.h> -#include <winbase.h> -#include <io.h> +#define VC_EXTRALEAN /*Exclude rarely-used stuff from Windows headers */ +#include <windows.h> /* H5_inline */ @@ -163,8 +148,6 @@ #endif /* -The inline keywords allows the compiler to insert a copy of -the function body into each place the function is called inline is now in C but in the C99 standard and not the old C89 version so MS doesn't recognize it yet (as of April 2001) */ |