summaryrefslogtreecommitdiffstats
path: root/src/H5Spkg.h
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2001-08-14 22:09:56 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2001-08-14 22:09:56 (GMT)
commite87fc517b8fc391cf18c268ce0b195eb7398a4a7 (patch)
tree494d1d87f71f87f320707989b7f12eec0f1d3805 /src/H5Spkg.h
parenteef2829d1655e42225b2400c6e3d123be26e08a8 (diff)
downloadhdf5-e87fc517b8fc391cf18c268ce0b195eb7398a4a7.zip
hdf5-e87fc517b8fc391cf18c268ce0b195eb7398a4a7.tar.gz
hdf5-e87fc517b8fc391cf18c268ce0b195eb7398a4a7.tar.bz2
[svn-r4355] Purpose:
Code cleanup (sorta) Description: When the first versions of the HDF5 library were designed, I remembered vividly the difficulties of porting code from a 32-bit platform to a 16-bit platform and asked that people use intn & uintn instead of int & unsigned int, respectively. However, in hindsight, this was overkill and unnecessary since we weren't going to be porting the HDF5 library to 16-bit architectures. Currently, the extra uintn & intn typedefs are causing problems for users who'd like to include both the HDF5 and HDF4 header files in one source module (like Kent's h4toh5 library). Solution: Changed the uintn & intn's to unsigned and int's respectively. Platforms tested: FreeBSD 4.4 (hawkwind)
Diffstat (limited to 'src/H5Spkg.h')
-rw-r--r--src/H5Spkg.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/H5Spkg.h b/src/H5Spkg.h
index 25a89d1..bc6f66e 100644
--- a/src/H5Spkg.h
+++ b/src/H5Spkg.h
@@ -23,7 +23,7 @@
*/
/* Simple extent container */
typedef struct H5S_simple_t {
- uintn rank; /* Number of dimensions */
+ unsigned rank; /* Number of dimensions */
hsize_t *size; /* Current size of the dimensions */
hsize_t *max; /* Maximum size of the dimensions */
#ifdef LATER
@@ -58,10 +58,10 @@ typedef struct H5S_hyper_node_tag {
hssize_t *start; /* Pointer to a corner of a hyperslab closest to the origin */
hssize_t *end; /* Pointer to a corner of a hyperslab furthest from the origin */
struct {
- uintn cached; /* Flag to indicate that the block is cached (during I/O only) */
+ unsigned cached; /* Flag to indicate that the block is cached (during I/O only) */
size_t size; /* Size of cached block (in elements) */
- uintn rleft; /* Read elements left to access in block */
- uintn wleft; /* Write elements left to access in block */
+ unsigned rleft; /* Read elements left to access in block */
+ unsigned wleft; /* Write elements left to access in block */
uint8_t *block; /* Pointer into buffer for cache */
uint8_t *rpos; /* Pointer to current read location within block */
uint8_t *wpos; /* Pointer to current write location within block */
@@ -183,9 +183,9 @@ __DLL__ int H5S_hyper_compare_regions(const void *r1, const void *r2);
__DLL__ int H5S_hyper_compare_bounds(const void *r1, const void *r2);
__DLL__ herr_t H5S_hyper_copy(H5S_t *dst, const H5S_t *src);
__DLL__ htri_t H5S_hyper_select_valid(const H5S_t *space);
-__DLL__ intn H5S_hyper_bound_comp(const void *_b1, const void *_b2);
-__DLL__ herr_t H5S_hyper_node_add(H5S_hyper_node_t **head, intn endflag,
- uintn rank, const hssize_t *start,
+__DLL__ int H5S_hyper_bound_comp(const void *_b1, const void *_b2);
+__DLL__ herr_t H5S_hyper_node_add(H5S_hyper_node_t **head, int endflag,
+ unsigned rank, const hssize_t *start,
const hsize_t *size);
__DLL__ herr_t H5S_hyper_clip(H5S_t *space, H5S_hyper_node_t *nodes,
H5S_hyper_node_t **uniq,