diff options
| author | Pedro Vicente Nunes <pvn@hdfgroup.org> | 2001-07-07 04:46:50 (GMT) |
|---|---|---|
| committer | Pedro Vicente Nunes <pvn@hdfgroup.org> | 2001-07-07 04:46:50 (GMT) |
| commit | f57b3a7945c77fa4bc6fd02e7c5f3ff1aec18a85 (patch) | |
| tree | 1df9d074b68834fec321fa63945b75ba471c02fb /src | |
| parent | 95bee3616116504bcec30bed984bacab356a426c (diff) | |
| download | hdf5-f57b3a7945c77fa4bc6fd02e7c5f3ff1aec18a85.zip hdf5-f57b3a7945c77fa4bc6fd02e7c5f3ff1aec18a85.tar.gz hdf5-f57b3a7945c77fa4bc6fd02e7c5f3ff1aec18a85.tar.bz2 | |
[svn-r4142]
Purpose
update windows headers that were causing compiler errors in the DLL versions
Platform tested:
:windows NT
Diffstat (limited to 'src')
| -rw-r--r-- | src/H5FDstdio.c | 9 | ||||
| -rw-r--r-- | src/H5private.h | 21 |
2 files changed, 4 insertions, 26 deletions
diff --git a/src/H5FDstdio.c b/src/H5FDstdio.c index bbe7970..2cf4eb9 100644 --- a/src/H5FDstdio.c +++ b/src/H5FDstdio.c @@ -21,17 +21,12 @@ #include "hdf5.h" - - #ifdef WIN32 -#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 <windows.h> #include <io.h> #endif + #ifdef MAX #undef MAX #endif /* MAX */ 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) */ |