summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDana Robinson <derobins@hdfgroup.org>2018-12-16 18:20:47 (GMT)
committerDana Robinson <derobins@hdfgroup.org>2018-12-16 18:20:47 (GMT)
commitf5886d5802bac188f39e1d961ba20c570153977d (patch)
tree916bd5619f9d5939a8a0e2afce4eefab9e4e0ee2
parent50ca26f3ec428de408040335f2a2999e750d98b3 (diff)
parent1b5190011bde5f2f47b01429cd97c11ade66f911 (diff)
downloadhdf5-f5886d5802bac188f39e1d961ba20c570153977d.zip
hdf5-f5886d5802bac188f39e1d961ba20c570153977d.tar.gz
hdf5-f5886d5802bac188f39e1d961ba20c570153977d.tar.bz2
Merge pull request #1383 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:strtok_windows_fix to develop
* commit '1b5190011bde5f2f47b01429cd97c11ade66f911': Added #define to use strtok_s instead of strtok_r on Windows.
-rw-r--r--src/H5win32defs.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/H5win32defs.h b/src/H5win32defs.h
index 4522228..c5e41d4 100644
--- a/src/H5win32defs.h
+++ b/src/H5win32defs.h
@@ -62,6 +62,7 @@ typedef __int64 h5_stat_size_t;
#define HDstat(S,B) _stati64(S,B)
#define HDstrcasecmp(A,B) _stricmp(A,B)
#define HDstrdup(S) _strdup(S)
+#define HDstrtok_r(X,Y,Z) strtok_s(X,Y,Z)
#define HDtzset() _tzset()
#define HDunlink(S) _unlink(S)
#define HDwrite(F,M,Z) _write(F,M,Z)