summaryrefslogtreecommitdiffstats
path: root/src/H5win32defs.h
diff options
context:
space:
mode:
authorDana Robinson <derobins@hdfgroup.org>2016-02-04 15:35:17 (GMT)
committerDana Robinson <derobins@hdfgroup.org>2016-02-04 15:35:17 (GMT)
commitc746447b0dccc66e89038e2eae93cc88db67f825 (patch)
tree4c172679318e8df2e028132c585b58efa0838644 /src/H5win32defs.h
parente9139733f2e6d90c5474d2593519ee7c45b00155 (diff)
downloadhdf5-c746447b0dccc66e89038e2eae93cc88db67f825.zip
hdf5-c746447b0dccc66e89038e2eae93cc88db67f825.tar.gz
hdf5-c746447b0dccc66e89038e2eae93cc88db67f825.tar.bz2
[svn-r29041] Patch from Steffen Kiess that allows a relative path to be specified
for external dataset files set via H5Pset_external(). Resolves HDFFV-8740 Tested on: 64-bit Ubuntu 15.10 (Linux 4.2.0 x86_64) gcc 5.2.1 autotools serial
Diffstat (limited to 'src/H5win32defs.h')
-rw-r--r--src/H5win32defs.h23
1 files changed, 14 insertions, 9 deletions
diff --git a/src/H5win32defs.h b/src/H5win32defs.h
index e84def9..2a0f22d 100644
--- a/src/H5win32defs.h
+++ b/src/H5win32defs.h
@@ -71,21 +71,24 @@ struct timezone {
};
#ifdef __cplusplus
- extern "C" {
+extern "C" {
#endif /* __cplusplus */
- H5_DLL int Wgettimeofday(struct timeval *tv, struct timezone *tz);
- H5_DLL int Wflock(int fd, int operation);
- 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 Wgettimeofday(struct timeval *tv, struct timezone *tz);
+ H5_DLL int Wsetenv(const char *name, const char *value, int overwrite);
+ H5_DLL int Wflock(int fd, int operation);
+ 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);
#ifdef __cplusplus
- }
+}
#endif /* __cplusplus */
+
#define HDgettimeofday(V,Z) Wgettimeofday(V,Z)
+#define HDsetenv(N,V,O) Wsetenv(N,V,O)
#define HDflock(F,L) Wflock(F,L)
#define HDgetlogin() Wgetlogin()
#define HDsnprintf c99_snprintf /*varargs*/
-#define HDvsnprintf c99_vsnprintf
+#define HDvsnprintf c99_vsnprintf /*varargs*/
#endif /* H5_HAVE_VISUAL_STUDIO */
@@ -98,5 +101,7 @@ struct timezone {
#ifndef H5_HAVE_MINGW
#define HDftruncate(F,L) _chsize_s(F,L)
#define HDfseek(F,O,W) _fseeki64(F,O,W)
-#endif
+#endif /* H5_HAVE_MINGW */
+
#endif /* H5_HAVE_WIN32_API */
+