diff options
| author | Scott Wegner <swegner@hdfgroup.org> | 2007-05-18 15:14:43 (GMT) |
|---|---|---|
| committer | Scott Wegner <swegner@hdfgroup.org> | 2007-05-18 15:14:43 (GMT) |
| commit | 87a41d4286718ebc06acf6a9021ea85b9a93f278 (patch) | |
| tree | 1e1946e375f700573b5718020a16c7e117f33c76 /src/H5FDstream.c | |
| parent | 513c74a8da0e7bb29b727ddc1409e7e6d7902461 (diff) | |
| download | hdf5-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 'src/H5FDstream.c')
| -rw-r--r-- | src/H5FDstream.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/H5FDstream.c b/src/H5FDstream.c index 678a1e5..06eaaaf 100644 --- a/src/H5FDstream.c +++ b/src/H5FDstream.c @@ -624,7 +624,7 @@ H5FD_stream_open (const char *filename, H5FD_stream_t *stream=NULL; const H5FD_stream_fapl_t *fapl; int o_flags; -#ifdef WIN32 +#ifdef _WIN32 WSADATA wsadata; #endif H5P_genplist_t *plist=NULL; /* Property list pointer */ @@ -649,7 +649,7 @@ H5FD_stream_open (const char *filename, if ((O_RDWR & o_flags) && ! (O_CREAT & o_flags)) HGOTO_ERROR (H5E_ARGS, H5E_UNSUPPORTED, NULL, "open stream for read/write not supported") -#ifdef WIN32 +#ifdef _WIN32 if (WSAStartup (MAKEWORD (2, 0), &wsadata)) HGOTO_ERROR (H5E_IO, H5E_CANTINIT, NULL, "Couldn't start Win32 socket layer") #endif |