diff options
author | Scott Wegner <swegner@hdfgroup.org> | 2008-08-06 17:18:47 (GMT) |
---|---|---|
committer | Scott Wegner <swegner@hdfgroup.org> | 2008-08-06 17:18:47 (GMT) |
commit | e47c44c04a4a603911c7220504234df3eae32807 (patch) | |
tree | 8abab77355f31c9f65ed4a59afa61062db4c635e /tools/h5ls/h5ls.c | |
parent | 8ee8a3fde6e9052de594c7409656af90cba8ea8a (diff) | |
download | hdf5-e47c44c04a4a603911c7220504234df3eae32807.zip hdf5-e47c44c04a4a603911c7220504234df3eae32807.tar.gz hdf5-e47c44c04a4a603911c7220504234df3eae32807.tar.bz2 |
[svn-r15438] Purpose: Bring the Windows H5pubconf.h up-to-date
Description:
This commit is a major update to the Windows-maintained H5pubconf.h file. This file is statically-distributed because Windows cannot generate it dynamically as other platforms do. Previously, our Windows version contained a minimal subset of the macro definitions required. To update, I've gone through each macro (based on kagiso's output), and tested for the correct value on Windows. This allows us to better target code based on feature flags. It should also be easier to update in the future as changes are made to the configure script.
This commit also contains one small bug fix in h5ls.c. Some Windows-specific code was missing a local variable definition. The bug went unnoticed because Windows didn't define the feature flag correctly.
I've also made changes to the h5vers script. Whenever the version string is incremented (automatically by h5test after a snapshot), the strings in H5pubconf.h will also be updated.
Tested:
VS2005 on WinXP (32- and 64-bit)
VS.NET on WinXP 32-bit
h5vers tested under Cygwin
Diffstat (limited to 'tools/h5ls/h5ls.c')
-rw-r--r-- | tools/h5ls/h5ls.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/h5ls/h5ls.c b/tools/h5ls/h5ls.c index 6545368..357dacf 100644 --- a/tools/h5ls/h5ls.c +++ b/tools/h5ls/h5ls.c @@ -1868,7 +1868,7 @@ get_width(void) { /* Win32 C */ CONSOLE_SCREEN_BUFFER_INFO scr; - GetConsoleScreenBufferInfo(con_out, &scr); + GetConsoleScreenBufferInfo(GetStdHandle(STD_OUTPUT_HANDLE), &scr); width = scr.srWindow.Right - scr.srWindow.Left + 1; } #elif defined(H5_HAVE__SCRSIZE) |