diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2011-09-12 14:02:44 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2011-09-12 14:02:44 (GMT) |
| commit | 9115bab9e36d72bb395820e38b6bee4c99dcd78c (patch) | |
| tree | 2fa4450bca7e33a1466fa2be8afb59a9370b8b64 /tools/h5import | |
| parent | ee039a03b9fca394251bd1b543df3aa819b13d51 (diff) | |
| download | hdf5-9115bab9e36d72bb395820e38b6bee4c99dcd78c.zip hdf5-9115bab9e36d72bb395820e38b6bee4c99dcd78c.tar.gz hdf5-9115bab9e36d72bb395820e38b6bee4c99dcd78c.tar.bz2 | |
[svn-r21376] JIRA-HDFFV-2748: Relplace WIN32 macros in source. New H5_HAVE_WIN32_API and H5_HAVE_VISUAL_STUDIO defines only need to be set on windows. Autotools configure is not affected.
Trunk passed for a week and cmake branch has been in place > 3 weeks.
Tested: local linux
Diffstat (limited to 'tools/h5import')
| -rwxr-xr-x | tools/h5import/h5import.c | 4 | ||||
| -rwxr-xr-x | tools/h5import/h5importtest.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tools/h5import/h5import.c b/tools/h5import/h5import.c index cfed58b..232f3c1 100755 --- a/tools/h5import/h5import.c +++ b/tools/h5import/h5import.c @@ -25,7 +25,7 @@ /* Name of tool */ #define PROGRAMNAME "h5import" -#ifdef WIN32 +#ifdef H5_HAVE_WIN32_API #define READ_OPEN_FLAGS "rb" #else #define READ_OPEN_FLAGS "r" @@ -309,7 +309,7 @@ static int processDataFile(char *infile, struct Input *in, hid_t file_id) const char *err11 = "Error in reading string data.\n"; /*------------------------------------------------------------------------- - * special case for opening binary classes in WIN32 + * special case for opening binary classes in H5_HAVE_WIN32_API * "FP" denotes a floating point binary file, * "IN" denotes a signed integer binary file, * "UIN" denotes an unsigned integer binary file, diff --git a/tools/h5import/h5importtest.c b/tools/h5import/h5importtest.c index 2869236..434cba7 100755 --- a/tools/h5import/h5importtest.c +++ b/tools/h5import/h5importtest.c @@ -16,7 +16,7 @@ #include <stdio.h> #include "H5private.h" -#ifdef WIN32 +#ifdef H5_HAVE_WIN32_API #define OPEN_FLAGS "wb" #else #define OPEN_FLAGS "w" |