summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPedro Vicente Nunes <pvn@hdfgroup.org>2001-07-09 16:04:44 (GMT)
committerPedro Vicente Nunes <pvn@hdfgroup.org>2001-07-09 16:04:44 (GMT)
commit2aa68eaac1264d6962ecc45cb5cc44cd66724e3e (patch)
tree815a36d20804f22ef7ccd2cb8661a950299220d9
parentf6ad8d2e08d33f28ddba70b2896301715949c0ad (diff)
downloadhdf5-2aa68eaac1264d6962ecc45cb5cc44cd66724e3e.zip
hdf5-2aa68eaac1264d6962ecc45cb5cc44cd66724e3e.tar.gz
hdf5-2aa68eaac1264d6962ecc45cb5cc44cd66724e3e.tar.bz2
[svn-r4155]
Purpose: updated windows headers in these 2 src files Description: Solution: Platforms tested: NT:
-rw-r--r--src/H5FDstdio.c9
-rw-r--r--src/H5private.h22
2 files changed, 7 insertions, 24 deletions
diff --git a/src/H5FDstdio.c b/src/H5FDstdio.c
index 0aa6fe7..67784b3 100644
--- a/src/H5FDstdio.c
+++ b/src/H5FDstdio.c
@@ -24,16 +24,11 @@
#endif
#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 5b3a6e7..9a30f18 100644
--- a/src/H5private.h
+++ b/src/H5private.h
@@ -134,20 +134,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 */
@@ -157,8 +145,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)
*/
@@ -168,7 +154,9 @@ MS doesn't recognize it yet (as of April 2001)
# define H5_inline
#endif
-#endif /*WIN32*/
+
+#endif
+/*WIN32*/
#ifndef F_OK
# define F_OK 00