[svn-r21531] Merge of 21501 and 21502 from trunk:

Note that this differs slightly from the trunk code since the VFL API won't be
changed until 1.10.  In the 1.8 branch, the term() function is public and this
required some #defines for the Windows VFD.

21501:

- Propagated Windows VFD tweaks to SEC2 and log VFDs.

- Created typedefs and #defines to make POSIX I/O type-safe on Windows and true POSIX platforms.

- Added pre-checks and removed post-checks for POSIX I/O sizes.  When the number of bytes to be sent exceeds the maximum return value, the operation is split into smaller subsets.

- General code tidying and cleanup.


21502:

- Removed Windows VFD code.  H5Pset_fapl_windows() actually sets the SEC2 driver, though it will still report H5FD_WINDOWS.

1 files changed, 9 insertions, 2 deletions

diff --git a/src/H5FDwindows.h b/src/H5FDwindows.h
index 8277f149..ecc28a7 100644
--- a/src/H5FDwindows.h
+++ b/src/H5FDwindows.h
@@ -24,6 +24,7 @@
 #define H5FDwindows_H

 

 #include "H5Ipublic.h"

+#include "H5FDsec2.h"

 

 #define H5FD_WINDOWS	(H5FD_windows_init())

 

@@ -31,8 +32,14 @@
 extern "C" {

 #endif

 

-H5_DLL hid_t H5FD_windows_init(void);

-H5_DLL void H5FD_windows_term(void);

+/* The code behind the windows VFD has been removed and the windows

+ * VFD initialization has been redirected to the SEC2 driver.  The

+ * "Windows" VFD was actually identical to the SEC2 driver code

+ * (a planned Win32 API driver never happened) so this change

+ * should be transparent to users.

+ */

+#define H5FD_windows_init H5FD_sec2_init

+#define H5FD_windows_term H5FD_sec2_term

 H5_DLL herr_t H5Pset_fapl_windows(hid_t fapl_id);

 

 #ifdef __cplusplus