summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlbert Cheng <acheng@hdfgroup.org>2010-08-05 00:15:08 (GMT)
committerAlbert Cheng <acheng@hdfgroup.org>2010-08-05 00:15:08 (GMT)
commitdc51db6583adbc23ab2862ee1093f4a49408c6f1 (patch)
tree16a1880866dd34dc91a6282eaf9e17066bfa299b
parente86d77f479b86900fe97927413aba356cef113c5 (diff)
downloadhdf5-dc51db6583adbc23ab2862ee1093f4a49408c6f1.zip
hdf5-dc51db6583adbc23ab2862ee1093f4a49408c6f1.tar.gz
hdf5-dc51db6583adbc23ab2862ee1093f4a49408c6f1.tar.bz2
[svn-r19171] Bug fix: 1917.
The previous fix had the Windows code in H5private.h but they should have been in H5win32defs.h which holds all Windows-specific definitions. Moved the fix. Tested: BP (AIX) to confirm the fix is still valid. Windows tests will occur in daily tests tonight.
-rw-r--r--src/H5private.h13
-rw-r--r--src/H5win32defs.h6
2 files changed, 11 insertions, 8 deletions
diff --git a/src/H5private.h b/src/H5private.h
index e6da2cc..e8e87e2 100644
--- a/src/H5private.h
+++ b/src/H5private.h
@@ -480,8 +480,9 @@ typedef struct {
* function (or any other non-HDF5 function) in the source!
*/
- /* Use platform-specific versions if necessary */
-#include "H5win32defs.h"
+/* Put all platform-specific definitions in the following file */
+/* so that the following definitions are platform free. */
+#include "H5win32defs.h" /* For Windows-specific definitions */
#ifndef HDabort
#define HDabort() abort()
@@ -912,18 +913,14 @@ H5_DLL int HDfprintf (FILE *stream, const char *fmt, ...);
#ifndef HDlongjmp
#define HDlongjmp(J,N) longjmp(J,N)
#endif /* HDlongjmp */
+/* HDlseek and HDoff_t must be defined together for consistency. */
#ifndef HDlseek
#ifdef H5_HAVE_LSEEK64
#define HDlseek(F,O,W) lseek64(F,O,W)
#define HDoff_t off64_t
#else
#define HDlseek(F,O,W) lseek(F,O,W)
- #if defined (_WIN32) && !defined(__MWERKS__)
- # /*MSVC*/
- # define HDoff_t __int64
- #else
- # define HDoff_t off_t
- #endif
+ #define HDoff_t off_t
#endif
#endif /* HDlseek */
#ifndef HDmalloc
diff --git a/src/H5win32defs.h b/src/H5win32defs.h
index 141ec82..d478e4c 100644
--- a/src/H5win32defs.h
+++ b/src/H5win32defs.h
@@ -56,6 +56,12 @@ typedef __int64 h5_stat_size_t;
#endif /* H5_HAVE_GETTIMEOFDAY */
#define HDgetdrive() _getdrive()
#define HDlseek(F,O,W) _lseeki64(F,O,W)
+#if !defined(__MWERKS__)
+# /*MSVC*/
+# define HDoff_t __int64
+#else
+# define HDoff_t off_t
+#endif
#define HDmemset(X,C,Z) memset((void*)(X),C,Z)
#define HDmkdir(S,M) _mkdir(S)
#define HDopen(S,F,M) _open(S,F|_O_BINARY,M)