diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2012-10-05 02:25:37 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2012-10-05 02:25:37 (GMT) |
| commit | cda42fdc77e5065fc4cd460a3eb508e4ca2ebba0 (patch) | |
| tree | 5d32921750c5d88b3b4ef33f7710171156b0faea /src/H5Pocpypl.c | |
| parent | 223bdd117305e813a137c1874ec8c7327968ccf3 (diff) | |
| download | hdf5-cda42fdc77e5065fc4cd460a3eb508e4ca2ebba0.zip hdf5-cda42fdc77e5065fc4cd460a3eb508e4ca2ebba0.tar.gz hdf5-cda42fdc77e5065fc4cd460a3eb508e4ca2ebba0.tar.bz2 | |
[svn-r22866] Description:
Correct use of 'uint8_t' parameter type in public header file (which was
causing Windows builds to fail).
Tested on:
Mac OSX/64 10.7.5 (amazon) w/debug
(too minor to require h5committest)
Diffstat (limited to 'src/H5Pocpypl.c')
| -rw-r--r-- | src/H5Pocpypl.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/H5Pocpypl.c b/src/H5Pocpypl.c index d2734b0..e5e5f51 100644 --- a/src/H5Pocpypl.c +++ b/src/H5Pocpypl.c @@ -85,8 +85,8 @@ static H5O_copy_dtype_merge_list_t *H5P__free_merge_comm_dtype_list(H5O_copy_dty static herr_t H5P__ocpy_reg_prop(H5P_genclass_t *pclass); /* Property callbacks */ -static herr_t H5P__ocpy_merge_comm_dt_list_enc(const void *value, uint8_t **pp, size_t *size); -static herr_t H5P__ocpy_merge_comm_dt_list_dec(const uint8_t **pp, void *value); +static herr_t H5P__ocpy_merge_comm_dt_list_enc(const void *value, void **_pp, size_t *size); +static herr_t H5P__ocpy_merge_comm_dt_list_dec(const void **_pp, void *value); static herr_t H5P__ocpy_merge_comm_dt_list_copy(const char* name, size_t size, void* value); static int H5P__ocpy_merge_comm_dt_list_cmp(const void *value1, const void *value2, size_t size); static herr_t H5P__ocpy_merge_comm_dt_list_close(const char* name, size_t size, void* value); @@ -219,9 +219,10 @@ H5P__free_merge_comm_dtype_list(H5O_copy_dtype_merge_list_t *dt_list) *------------------------------------------------------------------------- */ static herr_t -H5P__ocpy_merge_comm_dt_list_enc(const void *value, uint8_t **pp, size_t *size) +H5P__ocpy_merge_comm_dt_list_enc(const void *value, void **_pp, size_t *size) { const H5O_copy_dtype_merge_list_t * const *dt_list_ptr = (const H5O_copy_dtype_merge_list_t * const *)value; + uint8_t **pp = (uint8_t **)_pp; const H5O_copy_dtype_merge_list_t *dt_list; /* Pointer to merge named datatype list */ size_t len; /* Length of path component */ @@ -276,9 +277,10 @@ H5P__ocpy_merge_comm_dt_list_enc(const void *value, uint8_t **pp, size_t *size) *------------------------------------------------------------------------- */ static herr_t -H5P__ocpy_merge_comm_dt_list_dec(const uint8_t **pp, void *_value) +H5P__ocpy_merge_comm_dt_list_dec(const void **_pp, void *_value) { H5O_copy_dtype_merge_list_t **dt_list = (H5O_copy_dtype_merge_list_t **)_value; /* Pointer to merge named datatype list */ + const uint8_t **pp = (const uint8_t **)_pp; H5O_copy_dtype_merge_list_t *dt_list_tail = NULL, *tmp_dt_list = NULL; /* temporary merge named datatype lists */ size_t len; /* Length of path component */ herr_t ret_value = SUCCEED; /* Return value */ |