summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPedro Vicente Nunes <pvn@hdfgroup.org>2002-11-26 16:19:54 (GMT)
committerPedro Vicente Nunes <pvn@hdfgroup.org>2002-11-26 16:19:54 (GMT)
commit577bfbfc48bcc9510ebca1d2891797a958dd8264 (patch)
treea30d8490185df3ff4540af61c44419e6a1123eb6
parentf5f61bf7832273bf3701002377659a4e98c404b3 (diff)
downloadhdf5-577bfbfc48bcc9510ebca1d2891797a958dd8264.zip
hdf5-577bfbfc48bcc9510ebca1d2891797a958dd8264.tar.gz
hdf5-577bfbfc48bcc9510ebca1d2891797a958dd8264.tar.bz2
[svn-r6140] Purpose:
code warrior fix CW does not recognize the _stati64 type, changed HDstat macro accordingly Platforms tested: windows 2000 (MSVC, Code warrior) linux
-rw-r--r--release_docs/INSTALL_codewarrior.txt5
-rw-r--r--src/H5private.h21
-rwxr-xr-xwindows/all.zipbin226541 -> 226407 bytes
3 files changed, 22 insertions, 4 deletions
diff --git a/release_docs/INSTALL_codewarrior.txt b/release_docs/INSTALL_codewarrior.txt
index 445906b..4582e39 100644
--- a/release_docs/INSTALL_codewarrior.txt
+++ b/release_docs/INSTALL_codewarrior.txt
@@ -28,6 +28,11 @@ To install the HDF5 library:
the those compiled with the Microsoft Visual Studio compiler.
5. Enjoy.
+NOTE: The zlib library is needed for building the hdf5 library. The path
+of the zlib library must be defined in Target/Access Paths, for example
+D:\zlib
+
+
---------------------------------------------------------------------------
The HDF Group would like to thank Ron Liechty of Metrowerks technical
support for all the help provided during the development of this project.
diff --git a/src/H5private.h b/src/H5private.h
index 898a62e..1cd39c3 100644
--- a/src/H5private.h
+++ b/src/H5private.h
@@ -564,12 +564,18 @@ H5_DLL int HDfprintf (FILE *stream, const char *fmt, ...);
#define HDfsetpos(F,P) fsetpos(F,P)
/* definitions related to the file stat utilities */
#ifdef WIN32
-#define HDfstat(F,B) _fstati64(F,B)
-typedef struct _stati64 h5_stat_t;
+ #ifdef __MWERKS__
+ #define HDfstat(F,B) fstat(F,B)
+ typedef struct stat h5_stat_t;
+ #else /*MSVC*/
+ #define HDfstat(F,B) _fstati64(F,B)
+ typedef struct _stati64 h5_stat_t;
+ #endif
#else
#define HDfstat(F,B) fstat(F,B)
typedef struct stat h5_stat_t;
#endif
+
#define HDftell(F) ftell(F)
#define HDftruncate(F,L) ftruncate(F,L)
#define HDfwrite(M,Z,N,F) fwrite(M,Z,N,F)
@@ -706,11 +712,18 @@ typedef struct stat h5_stat_t;
#define HDsqrt(X) sqrt(X)
#define HDsrand(N) srand(N)
/* sscanf() variable arguments */
+
+
#ifdef WIN32
-#define HDstat(S,B) _stati64(S,B)
+ #ifdef __MWERKS__
+ #define HDstat(S,B) stat(S,B)
+ #else /*MSVC*/
+ #define HDstat(S,B) _stati64(S,B)
+ #endif
#else
-#define HDstat(S,B) stat(S,B)
+#define HDstat(S,B) stat(S,B)
#endif
+
#define HDstrcat(X,Y) strcat(X,Y)
#define HDstrchr(S,C) strchr(S,C)
#define HDstrcmp(X,Y) strcmp(X,Y)
diff --git a/windows/all.zip b/windows/all.zip
index 82a9b91..30d1e54 100755
--- a/windows/all.zip
+++ b/windows/all.zip
Binary files differ