diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2011-10-12 21:25:51 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2011-10-12 21:25:51 (GMT) |
| commit | b80f663629f73a8cd3fc46fd58b06c8bf4c528d7 (patch) | |
| tree | 5166d84e980d08195adb525dd5b96bc3e67adc4e /config | |
| parent | 3aa1b1d93cad549d092eba87826d207a5f04051b (diff) | |
| download | hdf5-b80f663629f73a8cd3fc46fd58b06c8bf4c528d7.zip hdf5-b80f663629f73a8cd3fc46fd58b06c8bf4c528d7.tar.gz hdf5-b80f663629f73a8cd3fc46fd58b06c8bf4c528d7.tar.bz2 | |
[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.
Diffstat (limited to 'config')
| -rw-r--r-- | config/cmake/ConfigureChecks.cmake | 3 | ||||
| -rw-r--r-- | config/cmake/H5pubconf.h.in | 7 |
2 files changed, 1 insertions, 9 deletions
diff --git a/config/cmake/ConfigureChecks.cmake b/config/cmake/ConfigureChecks.cmake index 87d68c9..733e1a6 100644 --- a/config/cmake/ConfigureChecks.cmake +++ b/config/cmake/ConfigureChecks.cmake @@ -156,9 +156,8 @@ IF (WINDOWS) # Set the flag to indicate that the machine has window style pathname, # that is, "drive-letter:\" (e.g. "C:") or "drive-letter:/" (e.g. "C:/"). # (This flag should be _unset_ for all machines, except for Windows) - # + # SET (H5_HAVE_WINDOW_PATH 1) - SET (WINDOWS_MAX_BUF (1024 * 1024 * 1024)) SET (LINK_LIBS ${LINK_LIBS} "kernel32") ENDIF (WINDOWS) SET (H5_DEFAULT_VFD H5FD_SEC2) diff --git a/config/cmake/H5pubconf.h.in b/config/cmake/H5pubconf.h.in index 935a1ac..70c6e50 100644 --- a/config/cmake/H5pubconf.h.in +++ b/config/cmake/H5pubconf.h.in @@ -12,13 +12,6 @@ /* Define if using a Windows compiler (i.e. Visual Studio) */ #cmakedefine H5_HAVE_VISUAL_STUDIO @H5_HAVE_VISUAL_STUDIO@ -/* Define if the Windows virtual file driver should use buffered IO functions */ -/* #undef WINDOWS_USE_STDIO */ - -/* Define the maximum write size for the Windows file driver. Larger writes - will be split into many writes. Safe values are 1 <= WINDOWS_MAX_BUF <= 2GB-1. */ -#cmakedefine WINDOWS_MAX_BUF (1024 * 1024 * 1024) - /* Defined if HDF5 was built with CMake AND build as a shared library */ #cmakedefine H5_BUILT_AS_DYNAMIC_LIB @H5_BUILT_AS_DYNAMIC_LIB@ |