[svn-r13409] Fixed bug in h5import under Visual Studio 2005 on Windows. VS2005 has problems with setvbuf, so conditionally defined HDsetvbuf in Windows file H5pubconf.h, and updated H5private.h and h5import.c accordingly.

Tested:
Windows XP, VS2005
kagiso

3 files changed, 4 insertions, 2 deletions

diff --git a/src/H5private.h b/src/H5private.h
index ea79690..fb0ca5e 100644
--- a/src/H5private.h
+++ b/src/H5private.h
@@ -759,7 +759,9 @@ typedef off_t                   h5_stat_size_t;
 #define HDsetpgid(P,PG)		setpgid(P,PG)
 #define HDsetsid()		setsid()
 #define HDsetuid(U)		setuid(U)
+#ifndef WIN32
 #define HDsetvbuf(F,S,M,Z)	setvbuf(F,S,M,Z)
+#endif
 #define HDsigaction(N,A)	sigaction(N,A)
 #define HDsigaddset(S,N)	sigaddset(S,N)
 #define HDsigdelset(S,N)	sigdelset(S,N)
diff --git a/tools/h5import/h5import.c b/tools/h5import/h5import.c
index 98d5e8c..5f9e5b3 100755
--- a/tools/h5import/h5import.c
+++ b/tools/h5import/h5import.c
@@ -39,8 +39,8 @@ int main(int argc, char *argv[])
     const char *err8 = "Invalid size of data - %s.\n";
     const char *err9 = "Cannot specify more than 30 input files in one call to h5import.\n";
 
-  (void) setvbuf(stderr, (char *) NULL, _IOLBF, 0);
-  (void) setvbuf(stdout, (char *) NULL, _IOLBF, 0);
+  (void) HDsetvbuf(stderr, (char *) NULL, _IOLBF, 0);
+  (void) HDsetvbuf(stdout, (char *) NULL, _IOLBF, 0);
 
  /*
   * validate the number of command line arguments
diff --git a/windows/all.zip b/windows/all.zip
index ba40ebf..472bbb9 100755
--- a/windows/all.zip
+++ b/windows/all.zip