diff options
| author | Mike McGreevy <mamcgree@hdfgroup.org> | 2008-05-15 17:36:23 (GMT) |
|---|---|---|
| committer | Mike McGreevy <mamcgree@hdfgroup.org> | 2008-05-15 17:36:23 (GMT) |
| commit | b6ea60eceb02a50b161e91f841b82213e4dd4af2 (patch) | |
| tree | 05d3e6b9eadb60d81547c50c38ccadba3995d0fc /src | |
| parent | 942083b81436934103e0fde18115aed6ed79c116 (diff) | |
| download | hdf5-b6ea60eceb02a50b161e91f841b82213e4dd4af2.zip hdf5-b6ea60eceb02a50b161e91f841b82213e4dd4af2.tar.gz hdf5-b6ea60eceb02a50b161e91f841b82213e4dd4af2.tar.bz2 | |
[svn-r15008] Purpose: configure and source code cleanup
Description: cleaning up configure related to removal of --disable-hsizet
flag, which we no longer support. Furthermore, the
H5_HAVE_LARGE_HSIZET macros in the source code have been
removed.
Tested: kagiso
Diffstat (limited to 'src')
| -rw-r--r-- | src/H5Osdspace.c | 5 | ||||
| -rw-r--r-- | src/H5config.h.in | 3 | ||||
| -rw-r--r-- | src/H5private.h | 5 | ||||
| -rw-r--r-- | src/H5public.h | 6 | ||||
| -rw-r--r-- | src/libhdf5.settings.in | 1 |
5 files changed, 0 insertions, 20 deletions
diff --git a/src/H5Osdspace.c b/src/H5Osdspace.c index 7806731..ab77965 100644 --- a/src/H5Osdspace.c +++ b/src/H5Osdspace.c @@ -130,11 +130,6 @@ H5O_sdspace_decode(H5F_t *f, hid_t UNUSED dxpl_id, const uint8_t *p) HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed"); for (i = 0; i < sdim->rank; i++) { H5F_DECODE_LENGTH (f, p, sdim->size[i]); -#ifndef H5_HAVE_LARGE_HSIZET - /* Rudimentary check for overflow of the dimension size */ - if(sdim->size[i] == 0) - HGOTO_ERROR(H5E_DATASPACE, H5E_BADSIZE, NULL, "invalid size detected"); -#endif /* H5_HAVE_LARGE_HSIZET */ } /* end for */ if (flags & H5S_VALID_MAX) { diff --git a/src/H5config.h.in b/src/H5config.h.in index 85456f5..b87764a 100644 --- a/src/H5config.h.in +++ b/src/H5config.h.in @@ -121,9 +121,6 @@ /* Define to 1 if you have the <io.h> header file. */ #undef HAVE_IO_H -/* Define if it's safe to use `long long' for hsize_t and hssize_t */ -#undef HAVE_LARGE_HSIZET - /* Define to 1 if you have the `crypto' library (-lcrypto). */ #undef HAVE_LIBCRYPTO diff --git a/src/H5private.h b/src/H5private.h index 4005b4d..6be0cfa 100644 --- a/src/H5private.h +++ b/src/H5private.h @@ -436,13 +436,8 @@ # define SIZET_MAX ((size_t)(ssize_t)(-1)) # define SSIZET_MAX ((ssize_t)(((size_t)1<<(8*sizeof(ssize_t)-1))-1)) #endif -#ifdef H5_HAVE_LARGE_HSIZET #define HSIZET_MAX ((hsize_t)ULLONG_MAX) #define HSSIZET_MAX ((hssize_t)LLONG_MAX) -#else /* H5_HAVE_LARGE_HSIZET */ -#define HSIZET_MAX ((hsize_t)SIZET_MAX) -#define HSSIZET_MAX ((hssize_t)SSIZET_MAX) -#endif /* H5_HAVE_LARGE_HSIZET */ #define HSSIZET_MIN (~(HSSIZET_MAX)) /* diff --git a/src/H5public.h b/src/H5public.h index 65ba74a..2784ad4 100644 --- a/src/H5public.h +++ b/src/H5public.h @@ -141,7 +141,6 @@ typedef __int64 ssize_t; * sizes are enabled then use a 64-bit data type, otherwise use the size of * memory objects. */ -#ifdef H5_HAVE_LARGE_HSIZET # if H5_SIZEOF_LONG_LONG>=8 typedef unsigned long long hsize_t; typedef signed long long hssize_t; @@ -151,11 +150,6 @@ typedef unsigned __int64 hsize_t; typedef signed __int64 hssize_t; # define H5_SIZEOF_HSIZE_T H5_SIZEOF___INT64 # 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 -#endif /* H5_HAVE_LARGE_HSIZET */ /* * File addresses have there own types. diff --git a/src/libhdf5.settings.in b/src/libhdf5.settings.in index 7a59673..0a54c4e 100644 --- a/src/libhdf5.settings.in +++ b/src/libhdf5.settings.in @@ -17,4 +17,3 @@ Archiver: @AR@ Ranlib: @RANLIB@ Debugged Packages: @DEBUG_PKG@ API Tracing: @TRACE_API@ -File addresses: @HSIZET@ |