diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2011-02-22 19:37:06 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2011-02-22 19:37:06 (GMT) |
| commit | 727b687ae6c80c9854cb53814fa1c12f27c2994c (patch) | |
| tree | fabe359aaddbe3b4d1e2bb58ceb3b94311d66a1c /test/h5test.c | |
| parent | 25486d50895fa4a30809d289b9aff4de583a9b84 (diff) | |
| download | hdf5-727b687ae6c80c9854cb53814fa1c12f27c2994c.zip hdf5-727b687ae6c80c9854cb53814fa1c12f27c2994c.tar.gz hdf5-727b687ae6c80c9854cb53814fa1c12f27c2994c.tar.bz2 | |
[svn-r20146] Description:
Bring r19714:20145 from trunk to revise_chunks branch.
Tested on:
FreeBSD/32 6.3 (duty) in debug mode
FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
Linux/32 2.6 (jam) w/PGI compilers, w/default API=1.8.x,
w/C++ & FORTRAN, w/threadsafe, in debug mode
Linux/64-amd64 2.6 (amani) w/Intel compilers, w/default API=1.6.x,
w/C++ & FORTRAN, in production mode
Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
w/szip filter, w/threadsafe, in production mode
Linux/PPC 2.6 (heiwa) w/C++ & FORTRAN, w/threadsafe, in debug mode
Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in debug mode
Mac OS X/32 10.6.6 (amazon) in debug mode
Mac OS X/32 10.6.6 (amazon) w/C++ & FORTRAN, w/threadsafe,
in production mode
Diffstat (limited to 'test/h5test.c')
| -rw-r--r-- | test/h5test.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/test/h5test.c b/test/h5test.c index 229efec..25b751f 100644 --- a/test/h5test.c +++ b/test/h5test.c @@ -27,11 +27,11 @@ #include "h5test.h" #include "H5srcdir.h" -#ifdef _WIN32 +#ifdef H5_HAVE_WINSOCK_H #include <process.h> #include <direct.h> #include <winsock2.h> -#endif /* _WIN32 */ +#endif /* H5_HAVE_WINSOCK_H */ /* * Define these environment variables or constants to influence functions in @@ -648,7 +648,7 @@ void h5_show_hostname(void) { char hostname[80]; -#ifdef _WIN32 +#ifdef H5_HAVE_WINSOCK_H WSADATA wsaData; int err; #endif @@ -670,7 +670,7 @@ h5_show_hostname(void) #else printf("thread 0."); #endif -#ifdef _WIN32 +#ifdef H5_HAVE_WINSOCK_H err = WSAStartup( MAKEWORD(2,2), &wsaData ); if ( err != 0 ) { @@ -700,7 +700,7 @@ h5_show_hostname(void) #else printf(" gethostname not supported\n"); #endif -#ifdef _WIN32 +#ifdef H5_HAVE_WINSOCK_H WSACleanup(); #endif } |