summaryrefslogtreecommitdiffstats
path: root/src/H5private.h
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2001-07-17 21:27:06 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2001-07-17 21:27:06 (GMT)
commit5c8bcc19175fc8d261aef18f4152d8aeaf9de9d8 (patch)
treef8003c1205506463e44ab2b075fbfcc8653b3479 /src/H5private.h
parent857e0e6e57f4f0a8ce9fec9b3200837065f3a058 (diff)
downloadhdf5-5c8bcc19175fc8d261aef18f4152d8aeaf9de9d8.zip
hdf5-5c8bcc19175fc8d261aef18f4152d8aeaf9de9d8.tar.gz
hdf5-5c8bcc19175fc8d261aef18f4152d8aeaf9de9d8.tar.bz2
[svn-r4232] Purpose:
Bug fix. Description: On some systems (linux when not using gcc) 'dev_t' is not actually a scalar variable. This causes the code which compares dev_t's in the file drivers to not compile. Also the H5_inline flag was not being set correctly in the H5private.h file. Solution: Set the H5_inline flag to '' (i.e. define it, but don't assign it a value) if it is not currently defined. Use DEV_T_IS_SCALAR flag from configure to correctly compare dev_t's using memcmp instead of a scalar flag. Platforms tested: FreeBSD 4.3 (hawkwind), Linux 2.4.2 (chiba city cluster at Argonne)
Diffstat (limited to 'src/H5private.h')
-rw-r--r--src/H5private.h15
1 files changed, 6 insertions, 9 deletions
diff --git a/src/H5private.h b/src/H5private.h
index 61e0c9e..c791a91 100644
--- a/src/H5private.h
+++ b/src/H5private.h
@@ -140,13 +140,6 @@
#define VC_EXTRALEAN /*Exclude rarely-used stuff from Windows headers */
#include <windows.h>
-/* H5_inline */
-
-/* remove any previous defs made by configure in unix */
-#ifdef H5_inline
-# undef H5_inline
-#endif
-
/*
inline is now in C but in the C99 standard and not the old C89 version so
MS doesn't recognize it yet (as of April 2001)
@@ -157,9 +150,13 @@ MS doesn't recognize it yet (as of April 2001)
# define H5_inline
#endif
+#endif /*WIN32*/
+
+/* H5_inline */
+#ifndef H5_inline
+#define H5_inline
+#endif /* H5_inline */
-#endif
-/*WIN32*/
#ifndef F_OK
# define F_OK 00