summaryrefslogtreecommitdiffstats
path: root/src/H5public.h
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2007-09-13 15:44:56 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2007-09-13 15:44:56 (GMT)
commit579284f422b6ed25b7a5f4a518c19740fff297c8 (patch)
tree564b2a7b4c13854a19ffaf465f94e6abd52d6340 /src/H5public.h
parent15d118faedd8e61e8ec2a715cf8fcea5b1afab35 (diff)
downloadhdf5-579284f422b6ed25b7a5f4a518c19740fff297c8.zip
hdf5-579284f422b6ed25b7a5f4a518c19740fff297c8.tar.gz
hdf5-579284f422b6ed25b7a5f4a518c19740fff297c8.tar.bz2
[svn-r14144] Description:
Move H5Gget_objinfo() to deprecated symbols section and retarget internal usage to H5Lget_info()/H5Oget_info(). Misc. other code cleanups... Tested on: FreeBSD/32 6.2 (duty) FreeBSD/64 6.2 (liberty) Linux/32 2.6 (kagiso) Linux/64 2.6 (smirom) AIX/32 5.3 (copper) Solaris/32 2.10 (linew) Mac OS X/32 10.4.10 (amazon)
Diffstat (limited to 'src/H5public.h')
-rw-r--r--src/H5public.h18
1 files changed, 6 insertions, 12 deletions
diff --git a/src/H5public.h b/src/H5public.h
index 6b66d7a..00ca6ab 100644
--- a/src/H5public.h
+++ b/src/H5public.h
@@ -148,23 +148,17 @@ typedef long_long ssize_t;
#endif
/*
- * The sizes of file objects have their own types defined here. If large
- * sizes are enabled then use a 64-bit data type, otherwise use the size of
- * memory objects.
+ * The sizes of file objects have their own types defined here, use a 64-bit
+ * type.
*/
-#ifdef H5_HAVE_LARGE_HSIZET
-# if H5_SIZEOF_LONG_LONG>=8
+#if H5_SIZEOF_LONG_LONG >= 8
typedef unsigned long_long hsize_t;
typedef signed long_long hssize_t;
# define H5_SIZEOF_HSIZE_T H5_SIZEOF_LONG_LONG
# define H5_SIZEOF_HSSIZE_T H5_SIZEOF_LONG_LONG
-# endif
-#else /* H5_HAVE_LARGE_HSIZET */
-typedef size_t hsize_t;
-typedef ssize_t hssize_t;
-# define H5_SIZEOF_HSIZE_T H5_SIZEOF_SIZE_T
-# define H5_SIZEOF_HSSIZE_T H5_SIZEOF_SIZE_T
-#endif /* H5_HAVE_LARGE_HSIZET */
+#else
+# error "nothing appropriate for hsize_t"
+#endif
/*
* File addresses have their own types.