summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDana Robinson <derobins@hdfgroup.org>2016-12-12 20:06:54 (GMT)
committerDana Robinson <derobins@hdfgroup.org>2016-12-12 20:06:54 (GMT)
commit00925c7ecf41df68eb53fb3691bff955062221b2 (patch)
tree2609382d7e2a5b80a6193c898a9999bdc9f4193e /src
parent1bdf8fe8f7e4ca75afe2ffb0049e152bc4dbb80d (diff)
parent651c2f30304ed9b8e9470039e46279635356a3cc (diff)
downloadhdf5-00925c7ecf41df68eb53fb3691bff955062221b2.zip
hdf5-00925c7ecf41df68eb53fb3691bff955062221b2.tar.gz
hdf5-00925c7ecf41df68eb53fb3691bff955062221b2.tar.bz2
Merge pull request #199 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:windows_nanosleep_fix to develop
Fixed bad implementation of Windows nanosleep equivalent. * commit '651c2f30304ed9b8e9470039e46279635356a3cc': Fix bad implementation of Windows nanosleep equivalent.
Diffstat (limited to 'src')
-rw-r--r--src/H5system.c7
-rw-r--r--src/H5win32defs.h3
2 files changed, 5 insertions, 5 deletions
diff --git a/src/H5system.c b/src/H5system.c
index 4aada77..ac323c0 100644
--- a/src/H5system.c
+++ b/src/H5system.c
@@ -923,13 +923,12 @@ Wflock(int fd, int operation) {
* Fall 2016
*--------------------------------------------------------------------------
*/
-void
-Wnanosleep(uint64_t nanosec)
+int
+Wnanosleep(const struct timespec *req, struct timespec *rem)
{
/* XXX: Currently just a placeholder */
- FUNC_ENTER_NOAPI_NOINIT_NOERR
+ return 0;
- FUNC_LEAVE_NOAPI_VOID
} /* end Wnanosleep() */
diff --git a/src/H5win32defs.h b/src/H5win32defs.h
index 33d37b6..63c3a16 100644
--- a/src/H5win32defs.h
+++ b/src/H5win32defs.h
@@ -42,7 +42,7 @@ typedef __int64 h5_stat_size_t;
#define HDlseek(F,O,W) _lseeki64(F,O,W)
#define HDlstat(S,B) _lstati64(S,B)
#define HDmkdir(S,M) _mkdir(S)
-#define HDnanosleep(S) Wnanosleep(S)
+#define HDnanosleep(N, O) Wnanosleep(N, O)
#define HDoff_t __int64
/* _O_BINARY must be set in Windows to avoid CR-LF <-> LF EOL
* transformations when performing I/O.
@@ -102,6 +102,7 @@ extern "C" {
H5_DLL char* Wgetlogin(void);
H5_DLL int c99_snprintf(char* str, size_t size, const char* format, ...);
H5_DLL int c99_vsnprintf(char* str, size_t size, const char* format, va_list ap);
+ H5_DLL int Wnanosleep(const struct timespec *req, struct timespec *rem);
/* Round functions only needed for VS2012 and earlier.
* They are always built to ensure they don't go stale and