summaryrefslogtreecommitdiffstats
path: root/hl
diff options
context:
space:
mode:
authorScott Wegner <swegner@hdfgroup.org>2007-05-18 15:14:43 (GMT)
committerScott Wegner <swegner@hdfgroup.org>2007-05-18 15:14:43 (GMT)
commit87a41d4286718ebc06acf6a9021ea85b9a93f278 (patch)
tree1e1946e375f700573b5718020a16c7e117f33c76 /hl
parent513c74a8da0e7bb29b727ddc1409e7e6d7902461 (diff)
downloadhdf5-87a41d4286718ebc06acf6a9021ea85b9a93f278.zip
hdf5-87a41d4286718ebc06acf6a9021ea85b9a93f278.tar.gz
hdf5-87a41d4286718ebc06acf6a9021ea85b9a93f278.tar.bz2
[svn-r13766] In Visual Studio 2005 for 64-bit, _WIN32 is defined, but not WIN32, so I've standardized all #ifdef's to use _WIN32. This should not affect any other platform.
Tested: Visual Studio (32- and 64-bit) on Win XP
Diffstat (limited to 'hl')
-rw-r--r--hl/src/H5LTanalyze.c4
-rw-r--r--hl/tools/gif2h5/hdfgifwr.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/hl/src/H5LTanalyze.c b/hl/src/H5LTanalyze.c
index b1bb29c..fd9c145 100644
--- a/hl/src/H5LTanalyze.c
+++ b/hl/src/H5LTanalyze.c
@@ -15,7 +15,7 @@
/*
* This file was generated by Lex with the command "lex -oH5LTanalyze.c H5LTanalyze.l".
- * Do NOT modify it by hand, but in line 33, "#ifndef WIN32" should be added because
+ * Do NOT modify it by hand, but in line 33, "#ifndef _WIN32" should be added because
* Windows doesn't have unistd.h header file.
*/
@@ -31,7 +31,7 @@
#define YY_FLEX_MINOR_VERSION 5
#include <stdio.h>
-#ifndef WIN32
+#ifndef _WIN32
#include <unistd.h>
#endif
diff --git a/hl/tools/gif2h5/hdfgifwr.c b/hl/tools/gif2h5/hdfgifwr.c
index 66cf0d1..e6d681a 100644
--- a/hl/tools/gif2h5/hdfgifwr.c
+++ b/hl/tools/gif2h5/hdfgifwr.c
@@ -172,7 +172,7 @@ static unsigned long cur_accum = 0;
static int cur_bits = 0;
#define MAXCODE(n_bits) ( (1 << (n_bits)) - 1)
-#ifndef WIN32
+#ifndef _WIN32
#define min(a,b) ((a>b) ? b : a)
#endif
#define XV_BITS 12 /* BITS was already defined on some systems */