diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2009-06-29 15:16:28 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2009-06-29 15:16:28 (GMT) |
| commit | 1ea6f35b7fe4c7e09ec6b0625a173b6eee22a0bd (patch) | |
| tree | c47e62884102cba3879633de86c7ef6edd9a584f | |
| parent | 84258bea90ac7c9286c6ef9d3f9fe723a2e71871 (diff) | |
| download | hdf5-1ea6f35b7fe4c7e09ec6b0625a173b6eee22a0bd.zip hdf5-1ea6f35b7fe4c7e09ec6b0625a173b6eee22a0bd.tar.gz hdf5-1ea6f35b7fe4c7e09ec6b0625a173b6eee22a0bd.tar.bz2 | |
[svn-r17125] Windows complained about using a void ptr in addition, cast ptr to char*.
Mac shared lib build complained about duplicate declaration, moved declaration to h5dump, the one place that used it.
Tested: linux, Windows
| -rw-r--r-- | tools/h5dump/h5dump.h | 3 | ||||
| -rw-r--r-- | tools/lib/h5tools.c | 4 | ||||
| -rw-r--r-- | tools/lib/h5tools.h | 3 |
3 files changed, 5 insertions, 5 deletions
diff --git a/tools/h5dump/h5dump.h b/tools/h5dump/h5dump.h index be77002..612327b 100644 --- a/tools/h5dump/h5dump.h +++ b/tools/h5dump/h5dump.h @@ -160,4 +160,7 @@ typedef struct h5dump_header_t { } h5dump_header_t; +/* mask list for packed bits */ +unsigned int packed_mask[8]; /* packed bits are restricted to 1 byte */ + #endif /* !H5DUMP_H__ */ diff --git a/tools/lib/h5tools.c b/tools/lib/h5tools.c index ce4b454..eb9aa26 100644 --- a/tools/lib/h5tools.c +++ b/tools/lib/h5tools.c @@ -1425,7 +1425,7 @@ hsize_t h5tools_dump_region_data_blocks(hid_t region_space, hid_t region_id, h5tools_str_append(buffer, "%s", jndx ? OPTIONAL_LINE_BREAK "" : ""); - h5tools_str_sprint(buffer, info, region_id, type_id, (region_buf + h5tools_str_sprint(buffer, info, region_id, type_id, ((char*)region_buf + jndx * type_size), ®ion_ctx); if (jndx + 1 < numelem || (flags & END_OF_DATA) == 0) @@ -1663,7 +1663,7 @@ hsize_t h5tools_dump_region_data_points(hid_t region_space, hid_t region_id, h5tools_region_simple_prefix(stream, info, ®ion_ctx, region_curr_pos, ptdata, 0); - h5tools_str_sprint(buffer, info, region_id, type_id, (region_buf + h5tools_str_sprint(buffer, info, region_id, type_id, ((char*)region_buf + jndx * type_size), ®ion_ctx); if (jndx + 1 < npoints || (region_flags & END_OF_DATA) == 0) diff --git a/tools/lib/h5tools.h b/tools/lib/h5tools.h index e78abcc..293adbc 100644 --- a/tools/lib/h5tools.h +++ b/tools/lib/h5tools.h @@ -510,9 +510,6 @@ struct subset_t { /* include after above stucts are defined */ #include "h5tools_str.h" -/* mask list for packed bits */ -unsigned int packed_mask[8]; /* packed bits are restricted to 1 byte */ - extern FILE *rawdatastream; /* output stream for raw data */ extern int bin_output; /* binary output */ extern int bin_form; /* binary form */ |