diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2016-02-11 04:40:10 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2016-02-11 04:40:10 (GMT) |
| commit | 5655e5a91a538bd2cc885e5927f8ed61ab8e166b (patch) | |
| tree | f98ac54c24471ec1adc4b47a338b7b7ec67d030e /src/H5win32defs.h | |
| parent | 63c90e5c67445de5deaaf45b70273fef1286ae60 (diff) | |
| download | hdf5-5655e5a91a538bd2cc885e5927f8ed61ab8e166b.zip hdf5-5655e5a91a538bd2cc885e5927f8ed61ab8e166b.tar.gz hdf5-5655e5a91a538bd2cc885e5927f8ed61ab8e166b.tar.bz2 | |
[svn-r29084] Revert of:
r29069 and 72 (gheap cleanup)
r29041 and 43 (HDFFV-8740 external storage)
These cause problems in the daily tests. They will be
re-introduced when their respective problems have been
addressed.
Tested on: 64-bit Ubuntu 15.10 (Linux 4.2.0 x86_64) gcc 5.2.1
autotools serial (check-vfd) w/ Fortran and C++
autotools parallel w/ Fortran
CMake serial
Diffstat (limited to 'src/H5win32defs.h')
| -rw-r--r-- | src/H5win32defs.h | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/src/H5win32defs.h b/src/H5win32defs.h index 2a0f22d..e84def9 100644 --- a/src/H5win32defs.h +++ b/src/H5win32defs.h @@ -71,24 +71,21 @@ struct timezone { }; #ifdef __cplusplus -extern "C" { + extern "C" { #endif /* __cplusplus */ - 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); + 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); #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 /*varargs*/ +#define HDvsnprintf c99_vsnprintf #endif /* H5_HAVE_VISUAL_STUDIO */ @@ -101,7 +98,5 @@ extern "C" { #ifndef H5_HAVE_MINGW #define HDftruncate(F,L) _chsize_s(F,L) #define HDfseek(F,O,W) _fseeki64(F,O,W) -#endif /* H5_HAVE_MINGW */ - +#endif #endif /* H5_HAVE_WIN32_API */ - |