diff options
| author | MuQun Yang <ymuqun@hdfgroup.org> | 2007-06-12 21:20:13 (GMT) |
|---|---|---|
| committer | MuQun Yang <ymuqun@hdfgroup.org> | 2007-06-12 21:20:13 (GMT) |
| commit | 765da09bad62fc5669b4aeea6b806e599fc5bdfd (patch) | |
| tree | 3c16423da7503e14549b3bbcd2651ae5ac3b2d93 | |
| parent | 3045853b76e84ab001c2076b36dcb31a1fab5aec (diff) | |
| download | hdf5-765da09bad62fc5669b4aeea6b806e599fc5bdfd.zip hdf5-765da09bad62fc5669b4aeea6b806e599fc5bdfd.tar.gz hdf5-765da09bad62fc5669b4aeea6b806e599fc5bdfd.tar.bz2 | |
[svn-r13856] H5FDwindows.h is included in the hdf5.h but we didn't put it into Makefile.am un
der /src. So when gmake check-install is run for HDF5 examples, it will fail. Th
e fix is to include a macro #ifdef H5_HAVE_WINDOW around #include H5FDwindows.h
so that H5FDwindows.h will only be included on windows, not on other platforms.
We've fixed with the same way for other source code that includes H5FDwindows.h.
This has been tested with h5committest. However, it takes a few hours to test all tests and except kagiso. Tests on linew and smirom cannot finish. It takes forever for the fheap test.
And for parallel test at kagiso, ph5diff test seems to be hanged. I think all of our changes will only affect windows. So in order not to block other developers to check in their code, we just go ahead to check our changes.
Kent Yang
| -rw-r--r-- | src/H5F.c | 2 | ||||
| -rw-r--r-- | src/H5FD.c | 2 | ||||
| -rw-r--r-- | src/H5Pfapl.c | 2 | ||||
| -rw-r--r-- | src/hdf5.h | 2 |
4 files changed, 8 insertions, 0 deletions
@@ -41,7 +41,9 @@ #include "H5FDmulti.h" /*multiple files partitioned by mem usage */ #include "H5FDsec2.h" /*Posix unbuffered I/O */ #include "H5FDstdio.h" /* Standard C buffered I/O */ +#ifdef H5_HAVE_WINDOWS #include "H5FDwindows.h" /* Windows buffered I/O */ +#endif #include "H5FDstream.h" /*in-memory files streamed via sockets */ #include "H5FDdirect.h" /*Linux direct I/O */ @@ -43,7 +43,9 @@ #include "H5FDmulti.h" /* Usage-partitioned file family */ #include "H5FDsec2.h" /* POSIX unbuffered file I/O */ #include "H5FDstdio.h" /* Standard C buffered I/O */ +#ifdef H5_HAVE_WINDOWS #include "H5FDwindows.h" /* Windows buffered I/O */ +#endif #include "H5FDstream.h" /* In-memory files streamed via sockets */ #include "H5FDdirect.h" /* Direct file I/O */ #include "H5FLprivate.h" /* Free lists */ diff --git a/src/H5Pfapl.c b/src/H5Pfapl.c index d2e80f2..81dba0c 100644 --- a/src/H5Pfapl.c +++ b/src/H5Pfapl.c @@ -44,7 +44,9 @@ /* Includes needed to set as default file driver */ #include "H5FDsec2.h" /* Posix unbuffered I/O file driver */ #include "H5FDstdio.h" /* Standard C buffered I/O */ +#ifdef H5_HAVE_WINDOWS #include "H5FDwindows.h" /* Windows buffered I/O */ +#endif /****************/ @@ -47,7 +47,9 @@ #include "H5FDmulti.h" /* Usage-partitioned file family */ #include "H5FDsec2.h" /* POSIX unbuffered file I/O */ #include "H5FDstdio.h" /* Standard C buffered I/O */ +#ifdef H5_HAVE_WINDOWS #include "H5FDwindows.h" /* Windows buffered I/O */ +#endif #include "H5FDstream.h" /* In-memory files streamed via sockets */ #include "H5FDdirect.h" /* Linux direct I/O */ |