diff options
| -rw-r--r-- | src/H5private.h | 4 | ||||
| -rwxr-xr-x | windows/src/H5pubconf.h | 10 |
2 files changed, 4 insertions, 10 deletions
diff --git a/src/H5private.h b/src/H5private.h index 493818f..184ef7c 100644 --- a/src/H5private.h +++ b/src/H5private.h @@ -772,8 +772,12 @@ int HDremove_all(const char * fname); #define HDsetpgid(P,PG) setpgid(P,PG) #define HDsetsid() setsid() #define HDsetuid(U) setuid(U) +/* Windows does not permit setting the buffer size to values + less than 2. */ #ifndef _WIN32 #define HDsetvbuf(F,S,M,Z) setvbuf(F,S,M,Z) +#else +#define HDsetvbuf(F,S,M,Z) setvbuf(F,S,M,(Z>1?Z:2)) #endif #define HDsigaction(N,A) sigaction(N,A) #define HDsigaddset(S,N) sigaddset(S,N) diff --git a/windows/src/H5pubconf.h b/windows/src/H5pubconf.h index 9c4ef9b..aaad8be 100755 --- a/windows/src/H5pubconf.h +++ b/windows/src/H5pubconf.h @@ -188,16 +188,6 @@ in the file file_io.win32.c and including it on the projects /* Check exception handling functions during data conversions */ #define H5_WANT_DCONV_EXCEPTION 1 -#if _MSC_VER >=1400 -/* visual studio 2005 doesn't support size of setvbuf to be less thn 1,This is a hacking, we would like to wait -visual studio 2005 to fix this problem. -*/ - -#define HDsetvbuf(F,S,M,Z) (((Z)>1)?setvbuf(F,S,M,Z):setvbuf(F,S,M,2)) - -#else -#define HDsetvbuf(F,S,M,Z) setvbuf(F,S,M,Z) -#endif /* uncomment the following line if we want parallel HDF5 support */ |