diff options
| author | MuQun Yang <ymuqun@hdfgroup.org> | 2001-06-21 20:06:32 (GMT) |
|---|---|---|
| committer | MuQun Yang <ymuqun@hdfgroup.org> | 2001-06-21 20:06:32 (GMT) |
| commit | a3b9db81d115ed72ec2e0bd855e33eb427714355 (patch) | |
| tree | 672a20c2ffd283d04017dfc5c49b64cb53088174 | |
| parent | 61b948ad23930cc8358cf2d3feb3ebe3581abf8c (diff) | |
| download | hdf5-a3b9db81d115ed72ec2e0bd855e33eb427714355.zip hdf5-a3b9db81d115ed72ec2e0bd855e33eb427714355.tar.gz hdf5-a3b9db81d115ed72ec2e0bd855e33eb427714355.tar.bz2 | |
[svn-r4047]
Purpose:
bug fix for windows
Description:
adding various windows macros
Solution:
see above
Platforms tested:
windows 2000, confirmed on linux.
| -rw-r--r-- | test/h5test.c | 9 | ||||
| -rw-r--r-- | test/iopipe.c | 8 |
2 files changed, 12 insertions, 5 deletions
diff --git a/test/h5test.c b/test/h5test.c index 23a9ce2..5317e02 100644 --- a/test/h5test.c +++ b/test/h5test.c @@ -16,6 +16,7 @@ #ifdef WIN32 #include <process.h> +#include <direct.h> #endif /* WIN32 */ /* @@ -401,10 +402,14 @@ h5_fixname(const char *base_name, hid_t fapl, char *fullname, size_t size) if (HDstat(fullname, &buf) < 0) /* The directory doesn't exist just yet */ - if (HDmkdir(fullname, (mode_t)0755) < 0 && errno != EEXIST) +#ifdef WIN32 + if (_mkdir(fullname)<0){ +#else + if (HDmkdir(fullname, (mode_t)0755) < 0 && errno != EEXIST){ +#endif /* We couldn't make the "/tmp/${USER,LOGIN}" subdirectory. * Default to PREFIX's original prefix value. */ - HDstrcpy(fullname, prefix); + HDstrcpy(fullname, prefix);} HDstrcat(fullname, "/"); HDstrcat(fullname, base_name); diff --git a/test/iopipe.c b/test/iopipe.c index fda5929..05694ae 100644 --- a/test/iopipe.c +++ b/test/iopipe.c @@ -9,6 +9,11 @@ /* See H5private.h for how to include headers */ #undef NDEBUG #include "hdf5.h" +#ifdef H5_HAVE_WINSOCK_H +#include <Winsock.h> +#endif /*Winsock.h includes windows.h, due to the different value of + WINVER, windows.h should be put before H5private.h. Kent yang 6/21/2001*/ + #include "H5private.h" #ifdef H5_STDC_HEADERS @@ -37,9 +42,6 @@ # include <sys/resource.h> #endif -#ifdef H5_HAVE_WINSOCK_H -#include <Winsock.h> -#endif #if defined (__MWERKS__) |