summaryrefslogtreecommitdiffstats
path: root/test/h5test.c
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 /test/h5test.c
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 'test/h5test.c')
-rw-r--r--test/h5test.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/test/h5test.c b/test/h5test.c
index 965c065..8e12a43 100644
--- a/test/h5test.c
+++ b/test/h5test.c
@@ -26,11 +26,11 @@
#include <sys/stat.h>
#include "h5test.h"
-#ifdef WIN32
+#ifdef _WIN32
#include <process.h>
#include <direct.h>
#include <winsock.h>
-#endif /* WIN32 */
+#endif /* _WIN32 */
/*
* Define these environment variables or constants to influence functions in
@@ -632,7 +632,7 @@ void
h5_show_hostname(void)
{
char hostname[80];
-#ifdef WIN32
+#ifdef _WIN32
WSADATA wsaData;
int err;
#endif
@@ -650,7 +650,7 @@ h5_show_hostname(void)
printf("thread 0.");
}
#elif defined(H5_HAVE_THREADSAFE)
-#ifdef WIN32
+#ifdef _WIN32
printf("some thread: no way to know the thread number from pthread on windows.");
#else
printf("thread %d.", (int)pthread_self());
@@ -659,7 +659,7 @@ h5_show_hostname(void)
#else
printf("thread 0.");
#endif
-#ifdef WIN32
+#ifdef _WIN32
err = WSAStartup( MAKEWORD(2,2), &wsaData );
if ( err != 0 ) {
@@ -689,7 +689,7 @@ h5_show_hostname(void)
#else
printf(" gethostname not supported\n");
#endif
-#ifdef WIN32
+#ifdef _WIN32
WSACleanup();
#endif
}