summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2009-02-18 20:02:05 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2009-02-18 20:02:05 (GMT)
commit5d69e87ff0f4a4c3ce72b69a944b73b46b5c2b7c (patch)
tree6bfe2263c050603e228fb929ad236a5069c11fae /src
parent85dc39846e418b7abd0e0b951f52d474a82eac80 (diff)
downloadhdf5-5d69e87ff0f4a4c3ce72b69a944b73b46b5c2b7c.zip
hdf5-5d69e87ff0f4a4c3ce72b69a944b73b46b5c2b7c.tar.gz
hdf5-5d69e87ff0f4a4c3ce72b69a944b73b46b5c2b7c.tar.bz2
[svn-r16489] Fixed bug #1459 by eliminating the macro long_long and replacing all instances with long long.
Tested: h5comittest fedora 10 x64 Vista 32, VS2005, IVF101 XP32, Cygwin
Diffstat (limited to 'src')
-rw-r--r--src/H5EA.c24
-rw-r--r--src/H5EAdbg.c6
-rw-r--r--src/H5EAdblkpage.c4
-rw-r--r--src/H5EAdblock.c6
-rw-r--r--src/H5EAiblock.c6
-rw-r--r--src/H5EAsblock.c6
-rw-r--r--src/H5EAtest.c4
-rw-r--r--src/H5FDmulti.c6
-rw-r--r--src/H5Ocopy.c2
-rw-r--r--src/H5Oshared.c2
-rw-r--r--src/H5T.c4
-rw-r--r--src/H5Tconv.c180
-rw-r--r--src/H5Tnative.c8
-rw-r--r--src/H5Tpublic.h2
-rw-r--r--src/H5Zscaleoffset.c126
-rw-r--r--src/H5Ztrans.c12
-rw-r--r--src/H5detect.c4
-rw-r--r--src/H5private.h8
-rw-r--r--src/H5public.h32
19 files changed, 212 insertions, 230 deletions
diff --git a/src/H5EA.c b/src/H5EA.c
index 86c54fd..f1ed71b 100644
--- a/src/H5EA.c
+++ b/src/H5EA.c
@@ -199,7 +199,7 @@ H5EA_open(H5F_t *f, hid_t dxpl_id, haddr_t ea_addr, const H5EA_class_t *cls))
HDfprintf(stderr, "%s: ea_addr = %a\n", FUNC, ea_addr);
#endif /* QAK */
if(NULL == (hdr = (H5EA_hdr_t *)H5AC_protect(f, dxpl_id, H5AC_EARRAY_HDR, ea_addr, cls, NULL, H5AC_READ)))
- H5E_THROW(H5E_CANTPROTECT, "unable to load extensible array header, address = %llu", (unsigned long_long)ea_addr)
+ H5E_THROW(H5E_CANTPROTECT, "unable to load extensible array header, address = %llu", (unsigned long long)ea_addr)
/* Check for pending array deletion */
if(hdr->pending_delete)
@@ -365,7 +365,7 @@ HDfprintf(stderr, "%s: Index block address is: %a\n", FUNC, hdr->idx_blk_addr);
/* Protect index block */
if(NULL == (iblock = H5EA__iblock_protect(hdr, dxpl_id, H5AC_WRITE)))
- H5E_THROW(H5E_CANTPROTECT, "unable to protect extensible array index block, address = %llu", (unsigned long_long)hdr->idx_blk_addr)
+ H5E_THROW(H5E_CANTPROTECT, "unable to protect extensible array index block, address = %llu", (unsigned long long)hdr->idx_blk_addr)
/* Check if element is in index block */
if(idx < hdr->cparam.idx_blk_elmts) {
@@ -420,7 +420,7 @@ HDfprintf(stderr, "%s: dblk_idx = %u, iblock->ndblk_addrs = %Zu\n", FUNC, dblk_i
/* Protect data block */
if(NULL == (dblock = H5EA__dblock_protect(hdr, dxpl_id, iblock->dblk_addrs[dblk_idx], hdr->sblk_info[sblk_idx].dblk_nelmts, H5AC_WRITE)))
- H5E_THROW(H5E_CANTPROTECT, "unable to protect extensible array data block, address = %llu", (unsigned long_long)iblock->dblk_addrs[dblk_idx])
+ H5E_THROW(H5E_CANTPROTECT, "unable to protect extensible array data block, address = %llu", (unsigned long long)iblock->dblk_addrs[dblk_idx])
/* Adjust index to offset in data block */
elmt_idx %= hdr->sblk_info[sblk_idx].dblk_nelmts;
@@ -455,7 +455,7 @@ HDfprintf(stderr, "%s: New super block address is: %a\n", FUNC, sblk_addr);
/* Protect super block */
if(NULL == (sblock = H5EA__sblock_protect(hdr, dxpl_id, iblock->sblk_addrs[sblk_off], sblk_idx, H5AC_WRITE)))
- H5E_THROW(H5E_CANTPROTECT, "unable to protect extensible array super block, address = %llu", (unsigned long_long)iblock->sblk_addrs[sblk_off])
+ H5E_THROW(H5E_CANTPROTECT, "unable to protect extensible array super block, address = %llu", (unsigned long long)iblock->sblk_addrs[sblk_off])
/* Compute the data block index in super block */
dblk_idx = (size_t)(elmt_idx / sblock->dblk_nelmts);
@@ -532,7 +532,7 @@ HDfprintf(stderr, "%s: sblock->dblk_page_size = %Zu\n", FUNC, sblock->dblk_page_
/* Protect data block page */
if(NULL == (dblk_page = H5EA__dblk_page_protect(hdr, dxpl_id, dblk_page_addr, H5AC_WRITE)))
- H5E_THROW(H5E_CANTPROTECT, "unable to protect extensible array data block page, address = %llu", (unsigned long_long)dblk_page_addr)
+ H5E_THROW(H5E_CANTPROTECT, "unable to protect extensible array data block page, address = %llu", (unsigned long long)dblk_page_addr)
/* Set pointer to elements */
elmts = dblk_page->elmts;
@@ -540,7 +540,7 @@ HDfprintf(stderr, "%s: sblock->dblk_page_size = %Zu\n", FUNC, sblock->dblk_page_
else {
/* Protect data block */
if(NULL == (dblock = H5EA__dblock_protect(hdr, dxpl_id, sblock->dblk_addrs[dblk_idx], sblock->dblk_nelmts, H5AC_WRITE)))
- H5E_THROW(H5E_CANTPROTECT, "unable to protect extensible array data block, address = %llu", (unsigned long_long)sblock->dblk_addrs[dblk_idx])
+ H5E_THROW(H5E_CANTPROTECT, "unable to protect extensible array data block, address = %llu", (unsigned long long)sblock->dblk_addrs[dblk_idx])
/* Set pointer to elements */
elmts = dblock->elmts;
@@ -639,7 +639,7 @@ HDfprintf(stderr, "%s: Index block address is: %a\n", FUNC, hdr->idx_blk_addr);
/* Protect index block */
if(NULL == (iblock = H5EA__iblock_protect(hdr, dxpl_id, H5AC_READ)))
- H5E_THROW(H5E_CANTPROTECT, "unable to protect extensible array index block, address = %llu", (unsigned long_long)hdr->idx_blk_addr)
+ H5E_THROW(H5E_CANTPROTECT, "unable to protect extensible array index block, address = %llu", (unsigned long long)hdr->idx_blk_addr)
/* Check if element is in index block */
if(idx < hdr->cparam.idx_blk_elmts) {
@@ -681,7 +681,7 @@ HDfprintf(stderr, "%s: dblk_idx = %u\n", FUNC, dblk_idx);
else {
/* Protect data block */
if(NULL == (dblock = H5EA__dblock_protect(hdr, dxpl_id, iblock->dblk_addrs[dblk_idx], hdr->sblk_info[sblk_idx].dblk_nelmts, H5AC_READ)))
- H5E_THROW(H5E_CANTPROTECT, "unable to protect extensible array data block, address = %llu", (unsigned long_long)iblock->dblk_addrs[dblk_idx])
+ H5E_THROW(H5E_CANTPROTECT, "unable to protect extensible array data block, address = %llu", (unsigned long long)iblock->dblk_addrs[dblk_idx])
/* Adjust index to offset in data block */
elmt_idx %= hdr->sblk_info[sblk_idx].dblk_nelmts;
@@ -705,7 +705,7 @@ HDfprintf(stderr, "%s: dblk_idx = %u\n", FUNC, dblk_idx);
else {
/* Protect super block */
if(NULL == (sblock = H5EA__sblock_protect(hdr, dxpl_id, iblock->sblk_addrs[sblk_off], sblk_idx, H5AC_READ)))
- H5E_THROW(H5E_CANTPROTECT, "unable to protect extensible array super block, address = %llu", (unsigned long_long)iblock->sblk_addrs[sblk_off])
+ H5E_THROW(H5E_CANTPROTECT, "unable to protect extensible array super block, address = %llu", (unsigned long long)iblock->sblk_addrs[sblk_off])
/* Compute the data block index in super block */
dblk_idx = (size_t)(elmt_idx / sblock->dblk_nelmts);
@@ -779,7 +779,7 @@ HDfprintf(stderr, "%s: elmt_idx = %Hu, dblk_page_addr = %a\n", FUNC, elmt_idx, d
/* Protect data block page */
if(NULL == (dblk_page = H5EA__dblk_page_protect(hdr, dxpl_id, dblk_page_addr, H5AC_READ)))
- H5E_THROW(H5E_CANTPROTECT, "unable to protect extensible array data block page, address = %llu", (unsigned long_long)dblk_page_addr)
+ H5E_THROW(H5E_CANTPROTECT, "unable to protect extensible array data block page, address = %llu", (unsigned long long)dblk_page_addr)
/* Set pointer to elements */
elmts = dblk_page->elmts;
@@ -788,7 +788,7 @@ HDfprintf(stderr, "%s: elmt_idx = %Hu, dblk_page_addr = %a\n", FUNC, elmt_idx, d
else {
/* Protect data block */
if(NULL == (dblock = H5EA__dblock_protect(hdr, dxpl_id, sblock->dblk_addrs[dblk_idx], sblock->dblk_nelmts, H5AC_READ)))
- H5E_THROW(H5E_CANTPROTECT, "unable to protect extensible array data block, address = %llu", (unsigned long_long)sblock->dblk_addrs[dblk_idx])
+ H5E_THROW(H5E_CANTPROTECT, "unable to protect extensible array data block, address = %llu", (unsigned long long)sblock->dblk_addrs[dblk_idx])
/* Set pointer to elements */
elmts = dblock->elmts;
@@ -924,7 +924,7 @@ H5EA_delete(H5F_t *f, hid_t dxpl_id, haddr_t ea_addr))
HDfprintf(stderr, "%s: ea_addr = %a\n", FUNC, ea_addr);
#endif /* QAK */
if(NULL == (hdr = (H5EA_hdr_t *)H5AC_protect(f, dxpl_id, H5AC_EARRAY_HDR, ea_addr, NULL, NULL, H5AC_WRITE)))
- H5E_THROW(H5E_CANTPROTECT, "unable to protect extensible array header, address = %llu", (unsigned long_long)ea_addr)
+ H5E_THROW(H5E_CANTPROTECT, "unable to protect extensible array header, address = %llu", (unsigned long long)ea_addr)
/* Check for files using shared array header */
if(hdr->file_rc)
diff --git a/src/H5EAdbg.c b/src/H5EAdbg.c
index 0cafe3d..2c903b2 100644
--- a/src/H5EAdbg.c
+++ b/src/H5EAdbg.c
@@ -208,7 +208,7 @@ H5EA__iblock_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int inde
/* Protect index block */
if(NULL == (iblock = H5EA__iblock_protect(hdr, dxpl_id, H5AC_READ)))
- H5E_THROW(H5E_CANTPROTECT, "unable to protect extensible array index block, address = %llu", (unsigned long_long)hdr->idx_blk_addr)
+ H5E_THROW(H5E_CANTPROTECT, "unable to protect extensible array index block, address = %llu", (unsigned long long)hdr->idx_blk_addr)
/* Print opening message */
HDfprintf(stream, "%*sExtensible Array Index Block...\n", indent, "");
@@ -321,7 +321,7 @@ H5EA__sblock_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int inde
/* Protect super block */
if(NULL == (sblock = H5EA__sblock_protect(hdr, dxpl_id, addr, sblk_idx, H5AC_READ)))
- H5E_THROW(H5E_CANTPROTECT, "unable to protect extensible array super block, address = %llu", (unsigned long_long)addr)
+ H5E_THROW(H5E_CANTPROTECT, "unable to protect extensible array super block, address = %llu", (unsigned long long)addr)
/* Print opening message */
HDfprintf(stream, "%*sExtensible Array Super Block...\n", indent, "");
@@ -405,7 +405,7 @@ H5EA__dblock_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int inde
/* Protect data block */
if(NULL == (dblock = H5EA__dblock_protect(hdr, dxpl_id, addr, dblk_nelmts, H5AC_READ)))
- H5E_THROW(H5E_CANTPROTECT, "unable to protect extensible array data block, address = %llu", (unsigned long_long)addr)
+ H5E_THROW(H5E_CANTPROTECT, "unable to protect extensible array data block, address = %llu", (unsigned long long)addr)
/* Print opening message */
HDfprintf(stream, "%*sExtensible Array data Block...\n", indent, "");
diff --git a/src/H5EAdblkpage.c b/src/H5EAdblkpage.c
index 4b9cc9d..a8edae1 100644
--- a/src/H5EAdblkpage.c
+++ b/src/H5EAdblkpage.c
@@ -223,7 +223,7 @@ HDfprintf(stderr, "%s: Called\n", FUNC);
/* Protect the data block page */
if(NULL == (ret_value = (H5EA_dblk_page_t *)H5AC_protect(hdr->f, dxpl_id, H5AC_EARRAY_DBLK_PAGE, dblk_page_addr, NULL, hdr, rw)))
- H5E_THROW(H5E_CANTPROTECT, "unable to protect extensible array data block page, address = %llu", (unsigned long_long)dblk_page_addr)
+ H5E_THROW(H5E_CANTPROTECT, "unable to protect extensible array data block page, address = %llu", (unsigned long long)dblk_page_addr)
CATCH
@@ -260,7 +260,7 @@ HDfprintf(stderr, "%s: Called\n", FUNC);
/* Unprotect the data block page */
if(H5AC_unprotect(dblk_page->hdr->f, dxpl_id, H5AC_EARRAY_DBLK_PAGE, dblk_page->addr, dblk_page, cache_flags) < 0)
- H5E_THROW(H5E_CANTUNPROTECT, "unable to unprotect extensible array data block page, address = %llu", (unsigned long_long)dblk_page->addr)
+ H5E_THROW(H5E_CANTUNPROTECT, "unable to unprotect extensible array data block page, address = %llu", (unsigned long long)dblk_page->addr)
CATCH
diff --git a/src/H5EAdblock.c b/src/H5EAdblock.c
index aec5af2..af2828a 100644
--- a/src/H5EAdblock.c
+++ b/src/H5EAdblock.c
@@ -317,7 +317,7 @@ HDfprintf(stderr, "%s: Called\n", FUNC);
/* Protect the data block */
if(NULL == (ret_value = (H5EA_dblock_t *)H5AC_protect(hdr->f, dxpl_id, H5AC_EARRAY_DBLOCK, dblk_addr, &dblk_nelmts, hdr, rw)))
- H5E_THROW(H5E_CANTPROTECT, "unable to protect extensible array data block, address = %llu", (unsigned long_long)dblk_addr)
+ H5E_THROW(H5E_CANTPROTECT, "unable to protect extensible array data block, address = %llu", (unsigned long long)dblk_addr)
CATCH
@@ -352,7 +352,7 @@ HDfprintf(stderr, "%s: Called\n", FUNC);
/* Unprotect the data block */
if(H5AC_unprotect(dblock->hdr->f, dxpl_id, H5AC_EARRAY_DBLOCK, dblock->addr, dblock, cache_flags) < 0)
- H5E_THROW(H5E_CANTUNPROTECT, "unable to unprotect extensible array data block, address = %llu", (unsigned long_long)dblock->addr)
+ H5E_THROW(H5E_CANTUNPROTECT, "unable to unprotect extensible array data block, address = %llu", (unsigned long long)dblock->addr)
CATCH
@@ -391,7 +391,7 @@ HDfprintf(stderr, "%s: Called\n", FUNC);
/* Protect data block */
if(NULL == (dblock = H5EA__dblock_protect(hdr, dxpl_id, dblk_addr, dblk_nelmts, H5AC_WRITE)))
- H5E_THROW(H5E_CANTPROTECT, "unable to protect extensible array data block, address = %llu", (unsigned long_long)dblk_addr)
+ H5E_THROW(H5E_CANTPROTECT, "unable to protect extensible array data block, address = %llu", (unsigned long long)dblk_addr)
/* Check if this is a paged data block */
if(dblk_nelmts > hdr->dblk_page_nelmts) {
diff --git a/src/H5EAiblock.c b/src/H5EAiblock.c
index 6fd6f2a..2d93015 100644
--- a/src/H5EAiblock.c
+++ b/src/H5EAiblock.c
@@ -292,7 +292,7 @@ HDfprintf(stderr, "%s: Called\n", FUNC);
/* Protect the index block */
if(NULL == (ret_value = (H5EA_iblock_t *)H5AC_protect(hdr->f, dxpl_id, H5AC_EARRAY_IBLOCK, hdr->idx_blk_addr, NULL, hdr, rw)))
- H5E_THROW(H5E_CANTPROTECT, "unable to protect extensible array index block, address = %llu", (unsigned long_long)hdr->idx_blk_addr)
+ H5E_THROW(H5E_CANTPROTECT, "unable to protect extensible array index block, address = %llu", (unsigned long long)hdr->idx_blk_addr)
CATCH
@@ -327,7 +327,7 @@ HDfprintf(stderr, "%s: Called\n", FUNC);
/* Unprotect the index block */
if(H5AC_unprotect(iblock->hdr->f, dxpl_id, H5AC_EARRAY_IBLOCK, iblock->addr, iblock, cache_flags) < 0)
- H5E_THROW(H5E_CANTUNPROTECT, "unable to unprotect extensible array index block, address = %llu", (unsigned long_long)iblock->addr)
+ H5E_THROW(H5E_CANTUNPROTECT, "unable to unprotect extensible array index block, address = %llu", (unsigned long long)iblock->addr)
CATCH
@@ -364,7 +364,7 @@ HDfprintf(stderr, "%s: Called\n", FUNC);
/* Protect index block */
if(NULL == (iblock = H5EA__iblock_protect(hdr, dxpl_id, H5AC_WRITE)))
- H5E_THROW(H5E_CANTPROTECT, "unable to protect extensible array index block, address = %llu", (unsigned long_long)hdr->idx_blk_addr)
+ H5E_THROW(H5E_CANTPROTECT, "unable to protect extensible array index block, address = %llu", (unsigned long long)hdr->idx_blk_addr)
/* Check for index block having data block pointers */
if(iblock->ndblk_addrs > 0) {
diff --git a/src/H5EAsblock.c b/src/H5EAsblock.c
index 4ad83b0..3cb97a9 100644
--- a/src/H5EAsblock.c
+++ b/src/H5EAsblock.c
@@ -289,7 +289,7 @@ HDfprintf(stderr, "%s: Called\n", FUNC);
/* Protect the super block */
if(NULL == (ret_value = (H5EA_sblock_t *)H5AC_protect(hdr->f, dxpl_id, H5AC_EARRAY_SBLOCK, sblk_addr, &sblk_idx, hdr, rw)))
- H5E_THROW(H5E_CANTPROTECT, "unable to protect extensible array super block, address = %llu", (unsigned long_long)sblk_addr)
+ H5E_THROW(H5E_CANTPROTECT, "unable to protect extensible array super block, address = %llu", (unsigned long long)sblk_addr)
CATCH
@@ -324,7 +324,7 @@ HDfprintf(stderr, "%s: Called\n", FUNC);
/* Unprotect the super block */
if(H5AC_unprotect(sblock->hdr->f, dxpl_id, H5AC_EARRAY_SBLOCK, sblock->addr, sblock, cache_flags) < 0)
- H5E_THROW(H5E_CANTUNPROTECT, "unable to unprotect extensible array super block, address = %llu", (unsigned long_long)sblock->addr)
+ H5E_THROW(H5E_CANTUNPROTECT, "unable to unprotect extensible array super block, address = %llu", (unsigned long long)sblock->addr)
CATCH
@@ -363,7 +363,7 @@ HDfprintf(stderr, "%s: Called\n", FUNC);
/* Protect super block */
if(NULL == (sblock = H5EA__sblock_protect(hdr, dxpl_id, sblk_addr, sblk_idx, H5AC_WRITE)))
- H5E_THROW(H5E_CANTPROTECT, "unable to protect extensible array super block, address = %llu", (unsigned long_long)sblk_addr)
+ H5E_THROW(H5E_CANTPROTECT, "unable to protect extensible array super block, address = %llu", (unsigned long long)sblk_addr)
/* Iterate over data blocks */
for(u = 0; u < sblock->ndblks; u++) {
diff --git a/src/H5EAtest.c b/src/H5EAtest.c
index 31dfb5f..58e8bc2 100644
--- a/src/H5EAtest.c
+++ b/src/H5EAtest.c
@@ -320,9 +320,9 @@ H5EA__test_debug(FILE *stream, int indent, int fwidth, hsize_t idx,
HDassert(elmt);
/* Print element */
- sprintf(temp_str, "Element #%llu:", (unsigned long_long)idx);
+ sprintf(temp_str, "Element #%llu:", (unsigned long long)idx);
HDfprintf(stream, "%*s%-*s %llu\n", indent, "", fwidth, temp_str,
- (unsigned long_long)*(const uint64_t *)elmt);
+ (unsigned long long)*(const uint64_t *)elmt);
END_FUNC(STATIC) /* end H5EA__test_debug() */
diff --git a/src/H5FDmulti.c b/src/H5FDmulti.c
index 2be54f8..e0421a7 100644
--- a/src/H5FDmulti.c
+++ b/src/H5FDmulti.c
@@ -1945,9 +1945,9 @@ H5FD_multi_flush(H5FD_t *_file, hid_t dxpl_id, unsigned closing)
if (HADDR_UNDEF!=file->memb_addr[mt]) {
haddr_t eoa = H5FDget_eoa(file->memb[mt], mt);
fprintf(stderr, " %6d %20llu %20llu %20llu %s\n",
- (int)mt, (unsigned long_long)(file->memb_addr[mt]),
- (unsigned long_long)eoa,
- (unsigned long_long)(file->memb_next[mt]),
+ (int)mt, (unsigned long long)(file->memb_addr[mt]),
+ (unsigned long long)eoa,
+ (unsigned long long)(file->memb_next[mt]),
file->memb_name[mt]);
}
}
diff --git a/src/H5Ocopy.c b/src/H5Ocopy.c
index 5334539..7b76f3d 100644
--- a/src/H5Ocopy.c
+++ b/src/H5Ocopy.c
@@ -1035,7 +1035,7 @@ H5O_copy_obj_by_ref(H5O_loc_t *src_oloc, hid_t dxpl_id, H5O_loc_t *dst_oloc,
new_oloc.addr = dst_oloc->addr;
/* Pick a default name for the new object */
- sprintf(tmp_obj_name, "~obj_pointed_by_%llu", (unsigned long_long)dst_oloc->addr);
+ sprintf(tmp_obj_name, "~obj_pointed_by_%llu", (unsigned long long)dst_oloc->addr);
/* Create a link to the newly copied object */
if(H5L_link(dst_root_loc, tmp_obj_name, &new_loc, H5P_DEFAULT, H5P_DEFAULT, dxpl_id) < 0)
diff --git a/src/H5Oshared.c b/src/H5Oshared.c
index e22a105..fd7cc8b 100644
--- a/src/H5Oshared.c
+++ b/src/H5Oshared.c
@@ -731,7 +731,7 @@ H5O_shared_debug(const H5O_shared_t *mesg, FILE *stream, int indent, int fwidth)
"SOHM");
HDfprintf(stream, "%*s%-*s %016llx\n", indent, "", fwidth,
"Heap ID:",
- (unsigned long_long)mesg->u.heap_id);
+ (unsigned long long)mesg->u.heap_id);
break;
case H5O_SHARE_TYPE_HERE:
diff --git a/src/H5T.c b/src/H5T.c
index 7e978e7..0345e5f 100644
--- a/src/H5T.c
+++ b/src/H5T.c
@@ -1052,7 +1052,7 @@ H5T_init_interface(void)
status |= H5T_register(H5T_PERS_HARD, "ldbl_dbl", native_ldouble, native_double, H5T_conv_ldouble_double, H5AC_dxpl_id, FALSE);
#endif /*H5T_CONV_INTERNAL_FP_LDOUBLE*/
- /* from long_long */
+ /* from long long */
status |= H5T_register(H5T_PERS_HARD, "llong_ullong", native_llong, native_ullong, H5T_conv_llong_ullong, H5AC_dxpl_id, FALSE);
status |= H5T_register(H5T_PERS_HARD, "ullong_llong", native_ullong, native_llong, H5T_conv_ullong_llong, H5AC_dxpl_id, FALSE);
status |= H5T_register(H5T_PERS_HARD, "llong_long", native_llong, native_long, H5T_conv_llong_long, H5AC_dxpl_id, FALSE);
@@ -2992,7 +2992,7 @@ H5T_create(H5T_class_t type, size_t size)
subtype = H5T_NATIVE_INT_g;
} else if (sizeof(long)==size) {
subtype = H5T_NATIVE_LONG_g;
- } else if (sizeof(long_long)==size) {
+ } else if (sizeof(long long)==size) {
subtype = H5T_NATIVE_LLONG_g;
} else {
HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, NULL, "no applicable native integer type");
diff --git a/src/H5Tconv.c b/src/H5Tconv.c
index 05277a8..90b7a21 100644
--- a/src/H5Tconv.c
+++ b/src/H5Tconv.c
@@ -241,7 +241,7 @@
#define H5T_CONV_sS(STYPE,DTYPE,ST,DT,D_MIN,D_MAX) { \
assert(sizeof(ST)<=sizeof(DT)); \
- H5T_CONV(H5T_CONV_xX, long_long, STYPE, DTYPE, ST, DT, D_MIN, D_MAX) \
+ H5T_CONV(H5T_CONV_xX, long long, STYPE, DTYPE, ST, DT, D_MIN, D_MAX) \
}
#define H5T_CONV_sU_CORE(S,D,ST,DT,D_MIN,D_MAX) { \
@@ -266,7 +266,7 @@
#define H5T_CONV_sU(STYPE,DTYPE,ST,DT,D_MIN,D_MAX) { \
assert(sizeof(ST)<=sizeof(DT)); \
- H5T_CONV(H5T_CONV_sU, long_long, STYPE, DTYPE, ST, DT, D_MIN, D_MAX) \
+ H5T_CONV(H5T_CONV_sU, long long, STYPE, DTYPE, ST, DT, D_MIN, D_MAX) \
}
#define H5T_CONV_uS_CORE(S,D,ST,DT,D_MIN,D_MAX) { \
@@ -291,17 +291,17 @@
#define H5T_CONV_uS(STYPE,DTYPE,ST,DT,D_MIN,D_MAX) { \
assert(sizeof(ST)<=sizeof(DT)); \
- H5T_CONV(H5T_CONV_uS, long_long, STYPE, DTYPE, ST, DT, D_MIN, D_MAX) \
+ H5T_CONV(H5T_CONV_uS, long long, STYPE, DTYPE, ST, DT, D_MIN, D_MAX) \
}
#define H5T_CONV_uU(STYPE,DTYPE,ST,DT,D_MIN,D_MAX) { \
assert(sizeof(ST)<=sizeof(DT)); \
- H5T_CONV(H5T_CONV_xX, long_long, STYPE, DTYPE, ST, DT, D_MIN, D_MAX) \
+ H5T_CONV(H5T_CONV_xX, long long, STYPE, DTYPE, ST, DT, D_MIN, D_MAX) \
}
#define H5T_CONV_Ss(STYPE,DTYPE,ST,DT,D_MIN,D_MAX) { \
assert(sizeof(ST)>=sizeof(DT)); \
- H5T_CONV(H5T_CONV_Xx, long_long, STYPE, DTYPE, ST, DT, D_MIN, D_MAX) \
+ H5T_CONV(H5T_CONV_Xx, long long, STYPE, DTYPE, ST, DT, D_MIN, D_MAX) \
}
#define H5T_CONV_Su_CORE(S,D,ST,DT,D_MIN,D_MAX) { \
@@ -337,17 +337,17 @@
#define H5T_CONV_Su(STYPE,DTYPE,ST,DT,D_MIN,D_MAX) { \
assert(sizeof(ST)>=sizeof(DT)); \
- H5T_CONV(H5T_CONV_Su, long_long, STYPE, DTYPE, ST, DT, D_MIN, D_MAX) \
+ H5T_CONV(H5T_CONV_Su, long long, STYPE, DTYPE, ST, DT, D_MIN, D_MAX) \
}
#define H5T_CONV_Us(STYPE,DTYPE,ST,DT,D_MIN,D_MAX) { \
assert(sizeof(ST)>=sizeof(DT)); \
- H5T_CONV(H5T_CONV_Ux, long_long, STYPE, DTYPE, ST, DT, D_MIN, D_MAX) \
+ H5T_CONV(H5T_CONV_Ux, long long, STYPE, DTYPE, ST, DT, D_MIN, D_MAX) \
}
#define H5T_CONV_Uu(STYPE,DTYPE,ST,DT,D_MIN,D_MAX) { \
assert(sizeof(ST)>=sizeof(DT)); \
- H5T_CONV(H5T_CONV_Ux, long_long, STYPE, DTYPE, ST, DT, D_MIN, D_MAX) \
+ H5T_CONV(H5T_CONV_Ux, long long, STYPE, DTYPE, ST, DT, D_MIN, D_MAX) \
}
#define H5T_CONV_su_CORE(S,D,ST,DT,D_MIN,D_MAX) { \
@@ -374,7 +374,7 @@
#define H5T_CONV_su(STYPE,DTYPE,ST,DT,D_MIN,D_MAX) { \
assert(sizeof(ST)==sizeof(DT)); \
- H5T_CONV(H5T_CONV_su, long_long, STYPE, DTYPE, ST, DT, D_MIN, D_MAX) \
+ H5T_CONV(H5T_CONV_su, long long, STYPE, DTYPE, ST, DT, D_MIN, D_MAX) \
}
#define H5T_CONV_us_CORE(S,D,ST,DT,D_MIN,D_MAX) { \
@@ -401,7 +401,7 @@
#define H5T_CONV_us(STYPE,DTYPE,ST,DT,D_MIN,D_MAX) { \
assert(sizeof(ST)==sizeof(DT)); \
- H5T_CONV(H5T_CONV_us, long_long, STYPE, DTYPE, ST, DT, D_MIN, D_MAX) \
+ H5T_CONV(H5T_CONV_us, long long, STYPE, DTYPE, ST, DT, D_MIN, D_MAX) \
}
#define H5T_CONV_fF(STYPE,DTYPE,ST,DT,D_MIN,D_MAX) { \
@@ -5019,7 +5019,7 @@ done:
/*-------------------------------------------------------------------------
* Function: H5T_conv_schar_llong
*
- * Purpose: Converts `signed char' to `long_long'
+ * Purpose: Converts `signed char' to `long long'
*
* Return: Success: Non-negative
*
@@ -5042,7 +5042,7 @@ H5T_conv_schar_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
FUNC_ENTER_NOAPI(H5T_conv_schar_llong, FAIL)
- H5T_CONV_sS(SCHAR, LLONG, signed char, long_long, -, -);
+ H5T_CONV_sS(SCHAR, LLONG, signed char, long long, -, -);
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -5052,7 +5052,7 @@ done:
/*-------------------------------------------------------------------------
* Function: H5T_conv_schar_ullong
*
- * Purpose: Converts `signed char' to `unsigned long_long'
+ * Purpose: Converts `signed char' to `unsigned long long'
*
* Return: Success: Non-negative
*
@@ -5075,7 +5075,7 @@ H5T_conv_schar_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
FUNC_ENTER_NOAPI(H5T_conv_schar_ullong, FAIL)
- H5T_CONV_sU(SCHAR, ULLONG, signed char, unsigned long_long, -, -);
+ H5T_CONV_sU(SCHAR, ULLONG, signed char, unsigned long long, -, -);
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -5085,7 +5085,7 @@ done:
/*-------------------------------------------------------------------------
* Function: H5T_conv_uchar_llong
*
- * Purpose: Converts `unsigned char' to `long_long'
+ * Purpose: Converts `unsigned char' to `long long'
*
* Return: Success: Non-negative
*
@@ -5108,7 +5108,7 @@ H5T_conv_uchar_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
FUNC_ENTER_NOAPI(H5T_conv_uchar_llong, FAIL)
- H5T_CONV_uS(UCHAR, LLONG, unsigned char, long_long, -, LLONG_MAX);
+ H5T_CONV_uS(UCHAR, LLONG, unsigned char, long long, -, LLONG_MAX);
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -5118,7 +5118,7 @@ done:
/*-------------------------------------------------------------------------
* Function: H5T_conv_uchar_ullong
*
- * Purpose: Converts `unsigned char' to `unsigned long_long'
+ * Purpose: Converts `unsigned char' to `unsigned long long'
*
* Return: Success: Non-negative
*
@@ -5141,7 +5141,7 @@ H5T_conv_uchar_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
FUNC_ENTER_NOAPI(H5T_conv_uchar_ullong, FAIL)
- H5T_CONV_uU(UCHAR, ULLONG, unsigned char, unsigned long_long, -, -);
+ H5T_CONV_uU(UCHAR, ULLONG, unsigned char, unsigned long long, -, -);
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -5613,7 +5613,7 @@ done:
/*-------------------------------------------------------------------------
* Function: H5T_conv_short_llong
*
- * Purpose: Converts `short' to `long_long'
+ * Purpose: Converts `short' to `long long'
*
* Return: Success: Non-negative
*
@@ -5636,7 +5636,7 @@ H5T_conv_short_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
FUNC_ENTER_NOAPI(H5T_conv_short_llong, FAIL)
- H5T_CONV_sS(SHORT, LLONG, short, long_long, -, -);
+ H5T_CONV_sS(SHORT, LLONG, short, long long, -, -);
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -5646,7 +5646,7 @@ done:
/*-------------------------------------------------------------------------
* Function: H5T_conv_short_ullong
*
- * Purpose: Converts `short' to `unsigned long_long'
+ * Purpose: Converts `short' to `unsigned long long'
*
* Return: Success: Non-negative
*
@@ -5669,7 +5669,7 @@ H5T_conv_short_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
FUNC_ENTER_NOAPI(H5T_conv_short_ullong, FAIL)
- H5T_CONV_sU(SHORT, ULLONG, short, unsigned long_long, -, -);
+ H5T_CONV_sU(SHORT, ULLONG, short, unsigned long long, -, -);
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -5679,7 +5679,7 @@ done:
/*-------------------------------------------------------------------------
* Function: H5T_conv_ushort_llong
*
- * Purpose: Converts `unsigned short' to `long_long'
+ * Purpose: Converts `unsigned short' to `long long'
*
* Return: Success: Non-negative
*
@@ -5702,7 +5702,7 @@ H5T_conv_ushort_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
FUNC_ENTER_NOAPI(H5T_conv_ushort_llong, FAIL)
- H5T_CONV_uS(USHORT, LLONG, unsigned short, long_long, -, LLONG_MAX);
+ H5T_CONV_uS(USHORT, LLONG, unsigned short, long long, -, LLONG_MAX);
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -5712,7 +5712,7 @@ done:
/*-------------------------------------------------------------------------
* Function: H5T_conv_ushort_ullong
*
- * Purpose: Converts `unsigned short' to `unsigned long_long'
+ * Purpose: Converts `unsigned short' to `unsigned long long'
*
* Return: Success: Non-negative
*
@@ -5735,7 +5735,7 @@ H5T_conv_ushort_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
FUNC_ENTER_NOAPI(H5T_conv_ushort_ullong, FAIL)
- H5T_CONV_uU(USHORT, ULLONG, unsigned short, unsigned long_long, -, -);
+ H5T_CONV_uU(USHORT, ULLONG, unsigned short, unsigned long long, -, -);
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -6201,7 +6201,7 @@ done:
/*-------------------------------------------------------------------------
* Function: H5T_conv_int_llong
*
- * Purpose: Converts `int' to `long_long'
+ * Purpose: Converts `int' to `long long'
*
* Return: Success: Non-negative
*
@@ -6223,7 +6223,7 @@ H5T_conv_int_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
FUNC_ENTER_NOAPI(H5T_conv_int_llong, FAIL)
- H5T_CONV_sS(INT, LLONG, int, long_long, -, -);
+ H5T_CONV_sS(INT, LLONG, int, long long, -, -);
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -6233,7 +6233,7 @@ done:
/*-------------------------------------------------------------------------
* Function: H5T_conv_int_ullong
*
- * Purpose: Converts `int' to `unsigned long_long'
+ * Purpose: Converts `int' to `unsigned long long'
*
* Return: Success: Non-negative
*
@@ -6255,7 +6255,7 @@ H5T_conv_int_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
FUNC_ENTER_NOAPI(H5T_conv_int_ullong, FAIL)
- H5T_CONV_sU(INT, ULLONG, int, unsigned long_long, -, -);
+ H5T_CONV_sU(INT, ULLONG, int, unsigned long long, -, -);
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -6265,7 +6265,7 @@ done:
/*-------------------------------------------------------------------------
* Function: H5T_conv_uint_llong
*
- * Purpose: Converts `unsigned int' to `long_long'
+ * Purpose: Converts `unsigned int' to `long long'
*
* Return: Success: Non-negative
*
@@ -6287,7 +6287,7 @@ H5T_conv_uint_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
FUNC_ENTER_NOAPI(H5T_conv_uint_llong, FAIL)
- H5T_CONV_uS(UINT, LLONG, unsigned, long_long, -, LLONG_MAX);
+ H5T_CONV_uS(UINT, LLONG, unsigned, long long, -, LLONG_MAX);
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -6297,7 +6297,7 @@ done:
/*-------------------------------------------------------------------------
* Function: H5T_conv_uint_ullong
*
- * Purpose: Converts `unsigned int' to `unsigned long_long'
+ * Purpose: Converts `unsigned int' to `unsigned long long'
*
* Return: Success: Non-negative
*
@@ -6320,7 +6320,7 @@ H5T_conv_uint_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
FUNC_ENTER_NOAPI(H5T_conv_uint_ullong, FAIL)
- H5T_CONV_uU(UINT, ULLONG, unsigned, unsigned long_long, -, -);
+ H5T_CONV_uU(UINT, ULLONG, unsigned, unsigned long long, -, -);
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -6782,7 +6782,7 @@ done:
/*-------------------------------------------------------------------------
* Function: H5T_conv_long_llong
*
- * Purpose: Converts `long' to `long_long'
+ * Purpose: Converts `long' to `long long'
*
* Return: Success: Non-negative
*
@@ -6804,7 +6804,7 @@ H5T_conv_long_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
FUNC_ENTER_NOAPI(H5T_conv_long_llong, FAIL)
- H5T_CONV_sS(LONG, LLONG, long, long_long, -, -);
+ H5T_CONV_sS(LONG, LLONG, long, long long, -, -);
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -6814,7 +6814,7 @@ done:
/*-------------------------------------------------------------------------
* Function: H5T_conv_long_ullong
*
- * Purpose: Converts `long' to `unsigned long_long'
+ * Purpose: Converts `long' to `unsigned long long'
*
* Return: Success: Non-negative
*
@@ -6837,7 +6837,7 @@ H5T_conv_long_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
FUNC_ENTER_NOAPI(H5T_conv_long_ullong, FAIL)
- H5T_CONV_sU(LONG, ULLONG, long, unsigned long_long, -, -);
+ H5T_CONV_sU(LONG, ULLONG, long, unsigned long long, -, -);
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -6847,7 +6847,7 @@ done:
/*-------------------------------------------------------------------------
* Function: H5T_conv_ulong_llong
*
- * Purpose: Converts `unsigned long' to `long_long'
+ * Purpose: Converts `unsigned long' to `long long'
*
* Return: Success: Non-negative
*
@@ -6870,7 +6870,7 @@ H5T_conv_ulong_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
FUNC_ENTER_NOAPI(H5T_conv_ulong_llong, FAIL)
- H5T_CONV_uS(ULONG, LLONG, unsigned long, long_long, -, LLONG_MAX);
+ H5T_CONV_uS(ULONG, LLONG, unsigned long, long long, -, LLONG_MAX);
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -6880,7 +6880,7 @@ done:
/*-------------------------------------------------------------------------
* Function: H5T_conv_ulong_ullong
*
- * Purpose: Converts `unsigned long' to `unsigned long_long'
+ * Purpose: Converts `unsigned long' to `unsigned long long'
*
* Return: Success: Non-negative
*
@@ -6903,7 +6903,7 @@ H5T_conv_ulong_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
FUNC_ENTER_NOAPI(H5T_conv_ulong_ullong, FAIL)
- H5T_CONV_uU(ULONG, ULLONG, unsigned long, unsigned long_long, -, -);
+ H5T_CONV_uU(ULONG, ULLONG, unsigned long, unsigned long long, -, -);
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -6913,7 +6913,7 @@ done:
/*-------------------------------------------------------------------------
* Function: H5T_conv_llong_schar
*
- * Purpose: Converts `long_long' to `signed char'
+ * Purpose: Converts `long long' to `signed char'
*
* Return: Success: Non-negative
*
@@ -6936,7 +6936,7 @@ H5T_conv_llong_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
FUNC_ENTER_NOAPI(H5T_conv_llong_schar, FAIL)
- H5T_CONV_Ss(LLONG, SCHAR, long_long, signed char, SCHAR_MIN, SCHAR_MAX);
+ H5T_CONV_Ss(LLONG, SCHAR, long long, signed char, SCHAR_MIN, SCHAR_MAX);
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -6946,7 +6946,7 @@ done:
/*-------------------------------------------------------------------------
* Function: H5T_conv_llong_uchar
*
- * Purpose: Converts `long_long' to `unsigned char'
+ * Purpose: Converts `long long' to `unsigned char'
*
* Return: Success: Non-negative
*
@@ -6969,7 +6969,7 @@ H5T_conv_llong_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
FUNC_ENTER_NOAPI(H5T_conv_llong_uchar, FAIL)
- H5T_CONV_Su(LLONG, UCHAR, long_long, unsigned char, -, UCHAR_MAX);
+ H5T_CONV_Su(LLONG, UCHAR, long long, unsigned char, -, UCHAR_MAX);
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -6979,7 +6979,7 @@ done:
/*-------------------------------------------------------------------------
* Function: H5T_conv_ullong_schar
*
- * Purpose: Converts `unsigned long_long' to `signed char'
+ * Purpose: Converts `unsigned long long' to `signed char'
*
* Return: Success: Non-negative
*
@@ -7002,7 +7002,7 @@ H5T_conv_ullong_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
FUNC_ENTER_NOAPI(H5T_conv_ullong_schar, FAIL)
- H5T_CONV_Us(ULLONG, SCHAR, unsigned long_long, signed char, -, SCHAR_MAX);
+ H5T_CONV_Us(ULLONG, SCHAR, unsigned long long, signed char, -, SCHAR_MAX);
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -7012,7 +7012,7 @@ done:
/*-------------------------------------------------------------------------
* Function: H5T_conv_ullong_uchar
*
- * Purpose: Converts `unsigned long_long' to `unsigned char'
+ * Purpose: Converts `unsigned long long' to `unsigned char'
*
* Return: Success: Non-negative
*
@@ -7035,7 +7035,7 @@ H5T_conv_ullong_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
FUNC_ENTER_NOAPI(H5T_conv_ullong_uchar, FAIL)
- H5T_CONV_Uu(ULLONG, UCHAR, unsigned long_long, unsigned char, -, UCHAR_MAX);
+ H5T_CONV_Uu(ULLONG, UCHAR, unsigned long long, unsigned char, -, UCHAR_MAX);
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -7045,7 +7045,7 @@ done:
/*-------------------------------------------------------------------------
* Function: H5T_conv_llong_short
*
- * Purpose: Converts `long_long' to `short'
+ * Purpose: Converts `long long' to `short'
*
* Return: Success: Non-negative
*
@@ -7068,7 +7068,7 @@ H5T_conv_llong_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
FUNC_ENTER_NOAPI(H5T_conv_llong_short, FAIL)
- H5T_CONV_Ss(LLONG, SHORT, long_long, short, SHRT_MIN, SHRT_MAX);
+ H5T_CONV_Ss(LLONG, SHORT, long long, short, SHRT_MIN, SHRT_MAX);
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -7078,7 +7078,7 @@ done:
/*-------------------------------------------------------------------------
* Function: H5T_conv_llong_ushort
*
- * Purpose: Converts `long_long' to `unsigned short'
+ * Purpose: Converts `long long' to `unsigned short'
*
* Return: Success: Non-negative
*
@@ -7101,7 +7101,7 @@ H5T_conv_llong_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
FUNC_ENTER_NOAPI(H5T_conv_llong_ushort, FAIL)
- H5T_CONV_Su(LLONG, USHORT, long_long, unsigned short, -, USHRT_MAX);
+ H5T_CONV_Su(LLONG, USHORT, long long, unsigned short, -, USHRT_MAX);
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -7111,7 +7111,7 @@ done:
/*-------------------------------------------------------------------------
* Function: H5T_conv_ullong_short
*
- * Purpose: Converts `unsigned long_long' to `short'
+ * Purpose: Converts `unsigned long long' to `short'
*
* Return: Success: Non-negative
*
@@ -7134,7 +7134,7 @@ H5T_conv_ullong_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
FUNC_ENTER_NOAPI(H5T_conv_ullong_short, FAIL)
- H5T_CONV_Us(ULLONG, SHORT, unsigned long_long, short, -, SHRT_MAX);
+ H5T_CONV_Us(ULLONG, SHORT, unsigned long long, short, -, SHRT_MAX);
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -7144,7 +7144,7 @@ done:
/*-------------------------------------------------------------------------
* Function: H5T_conv_ullong_ushort
*
- * Purpose: Converts `unsigned long_long' to `unsigned short'
+ * Purpose: Converts `unsigned long long' to `unsigned short'
*
* Return: Success: Non-negative
*
@@ -7167,7 +7167,7 @@ H5T_conv_ullong_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
FUNC_ENTER_NOAPI(H5T_conv_ullong_ushort, FAIL)
- H5T_CONV_Uu(ULLONG, USHORT, unsigned long_long, unsigned short, -, USHRT_MAX);
+ H5T_CONV_Uu(ULLONG, USHORT, unsigned long long, unsigned short, -, USHRT_MAX);
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -7177,7 +7177,7 @@ done:
/*-------------------------------------------------------------------------
* Function: H5T_conv_llong_int
*
- * Purpose: Converts `long_long' to `int'
+ * Purpose: Converts `long long' to `int'
*
* Return: Success: Non-negative
*
@@ -7199,7 +7199,7 @@ H5T_conv_llong_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
FUNC_ENTER_NOAPI(H5T_conv_llong_int, FAIL)
- H5T_CONV_Ss(LLONG, INT, long_long, int, INT_MIN, INT_MAX);
+ H5T_CONV_Ss(LLONG, INT, long long, int, INT_MIN, INT_MAX);
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -7209,7 +7209,7 @@ done:
/*-------------------------------------------------------------------------
* Function: H5T_conv_llong_uint
*
- * Purpose: Converts `long_long' to `unsigned int'
+ * Purpose: Converts `long long' to `unsigned int'
*
* Return: Success: Non-negative
*
@@ -7231,7 +7231,7 @@ H5T_conv_llong_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
FUNC_ENTER_NOAPI(H5T_conv_llong_uint, FAIL)
- H5T_CONV_Su(LLONG, UINT, long_long, unsigned, -, UINT_MAX);
+ H5T_CONV_Su(LLONG, UINT, long long, unsigned, -, UINT_MAX);
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -7241,7 +7241,7 @@ done:
/*-------------------------------------------------------------------------
* Function: H5T_conv_ullong_int
*
- * Purpose: Converts `unsigned long_long' to `int'
+ * Purpose: Converts `unsigned long long' to `int'
*
* Return: Success: Non-negative
*
@@ -7263,7 +7263,7 @@ H5T_conv_ullong_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
FUNC_ENTER_NOAPI(H5T_conv_ullong_int, FAIL)
- H5T_CONV_Us(ULLONG, INT, unsigned long_long, int, -, INT_MAX);
+ H5T_CONV_Us(ULLONG, INT, unsigned long long, int, -, INT_MAX);
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -7273,7 +7273,7 @@ done:
/*-------------------------------------------------------------------------
* Function: H5T_conv_ullong_uint
*
- * Purpose: Converts `unsigned long_long' to `unsigned int'
+ * Purpose: Converts `unsigned long long' to `unsigned int'
*
* Return: Success: Non-negative
*
@@ -7296,7 +7296,7 @@ H5T_conv_ullong_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
FUNC_ENTER_NOAPI(H5T_conv_ullong_uint, FAIL)
- H5T_CONV_Uu(ULLONG, UINT, unsigned long_long, unsigned, -, UINT_MAX);
+ H5T_CONV_Uu(ULLONG, UINT, unsigned long long, unsigned, -, UINT_MAX);
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -7306,7 +7306,7 @@ done:
/*-------------------------------------------------------------------------
* Function: H5T_conv_llong_long
*
- * Purpose: Converts `long_long' to `long'
+ * Purpose: Converts `long long' to `long'
*
* Return: Success: Non-negative
*
@@ -7328,7 +7328,7 @@ H5T_conv_llong_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
FUNC_ENTER_NOAPI(H5T_conv_llong_long, FAIL)
- H5T_CONV_Ss(LLONG, LONG, long_long, long, LONG_MIN, LONG_MAX);
+ H5T_CONV_Ss(LLONG, LONG, long long, long, LONG_MIN, LONG_MAX);
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -7338,7 +7338,7 @@ done:
/*-------------------------------------------------------------------------
* Function: H5T_conv_llong_ulong
*
- * Purpose: Converts `long_long' to `unsigned long'
+ * Purpose: Converts `long long' to `unsigned long'
*
* Return: Success: Non-negative
*
@@ -7361,7 +7361,7 @@ H5T_conv_llong_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
FUNC_ENTER_NOAPI(H5T_conv_llong_ulong, FAIL)
- H5T_CONV_Su(LLONG, ULONG, long_long, unsigned long, -, ULONG_MAX);
+ H5T_CONV_Su(LLONG, ULONG, long long, unsigned long, -, ULONG_MAX);
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -7371,7 +7371,7 @@ done:
/*-------------------------------------------------------------------------
* Function: H5T_conv_ullong_long
*
- * Purpose: Converts `unsigned long_long' to `long'
+ * Purpose: Converts `unsigned long long' to `long'
*
* Return: Success: Non-negative
*
@@ -7394,7 +7394,7 @@ H5T_conv_ullong_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
FUNC_ENTER_NOAPI(H5T_conv_ullong_long, FAIL)
- H5T_CONV_Us(ULLONG, LONG, unsigned long_long, long, -, LONG_MAX);
+ H5T_CONV_Us(ULLONG, LONG, unsigned long long, long, -, LONG_MAX);
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -7404,7 +7404,7 @@ done:
/*-------------------------------------------------------------------------
* Function: H5T_conv_ullong_ulong
*
- * Purpose: Converts `unsigned long_long' to `unsigned long'
+ * Purpose: Converts `unsigned long long' to `unsigned long'
*
* Return: Success: Non-negative
*
@@ -7427,7 +7427,7 @@ H5T_conv_ullong_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
FUNC_ENTER_NOAPI(H5T_conv_ullong_ulong, FAIL)
- H5T_CONV_Uu(ULLONG, ULONG, unsigned long_long, unsigned long, -, ULONG_MAX);
+ H5T_CONV_Uu(ULLONG, ULONG, unsigned long long, unsigned long, -, ULONG_MAX);
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -7437,7 +7437,7 @@ done:
/*-------------------------------------------------------------------------
* Function: H5T_conv_llong_ullong
*
- * Purpose: Converts `long_long' to `unsigned long_long'
+ * Purpose: Converts `long long' to `unsigned long long'
*
* Return: Success: non-negative
*
@@ -7460,7 +7460,7 @@ H5T_conv_llong_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
FUNC_ENTER_NOAPI(H5T_conv_llong_ullong, FAIL)
- H5T_CONV_su(LLONG, ULLONG, long_long, unsigned long_long, -, -);
+ H5T_CONV_su(LLONG, ULLONG, long long, unsigned long long, -, -);
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -7470,7 +7470,7 @@ done:
/*-------------------------------------------------------------------------
* Function: H5T_conv_ullong_llong
*
- * Purpose: Converts `unsigned long_long' to `long_long'
+ * Purpose: Converts `unsigned long long' to `long long'
*
* Return: Success: non-negative
*
@@ -7493,7 +7493,7 @@ H5T_conv_ullong_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
FUNC_ENTER_NOAPI(H5T_conv_ullong_llong, FAIL)
- H5T_CONV_us(ULLONG, LLONG, unsigned long_long, long_long, -, LLONG_MAX);
+ H5T_CONV_us(ULLONG, LLONG, unsigned long long, long long, -, LLONG_MAX);
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -8529,7 +8529,7 @@ H5T_conv_llong_float (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
FUNC_ENTER_NOAPI(H5T_conv_llong_float, FAIL)
- H5T_CONV_xF(LLONG, FLOAT, long_long, float, -, -);
+ H5T_CONV_xF(LLONG, FLOAT, long long, float, -, -);
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -8561,7 +8561,7 @@ H5T_conv_llong_double (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
FUNC_ENTER_NOAPI(H5T_conv_llong_double, FAIL)
- H5T_CONV_xF(LLONG, DOUBLE, long_long, double, -, -);
+ H5T_CONV_xF(LLONG, DOUBLE, long long, double, -, -);
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -8594,7 +8594,7 @@ H5T_conv_llong_ldouble (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
FUNC_ENTER_NOAPI(H5T_conv_llong_ldouble, FAIL)
- H5T_CONV_xF(LLONG, LDOUBLE, long_long, long double, -, -);
+ H5T_CONV_xF(LLONG, LDOUBLE, long long, long double, -, -);
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -8628,7 +8628,7 @@ H5T_conv_ullong_float (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
FUNC_ENTER_NOAPI(H5T_conv_ullong_float, FAIL)
- H5T_CONV_xF(ULLONG, FLOAT, unsigned long_long, float, -, -);
+ H5T_CONV_xF(ULLONG, FLOAT, unsigned long long, float, -, -);
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -8662,7 +8662,7 @@ H5T_conv_ullong_double (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
FUNC_ENTER_NOAPI(H5T_conv_ullong_double, FAIL)
- H5T_CONV_xF(ULLONG, DOUBLE, unsigned long_long, double, -, -);
+ H5T_CONV_xF(ULLONG, DOUBLE, unsigned long long, double, -, -);
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -8696,7 +8696,7 @@ H5T_conv_ullong_ldouble (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
FUNC_ENTER_NOAPI(H5T_conv_ullong_ldouble, FAIL)
- H5T_CONV_xF(ULLONG, LDOUBLE, unsigned long_long, long double, -, -);
+ H5T_CONV_xF(ULLONG, LDOUBLE, unsigned long long, long double, -, -);
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -9514,7 +9514,7 @@ H5T_conv_float_llong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
FUNC_ENTER_NOAPI(H5T_conv_float_llong, FAIL)
- H5T_CONV_Fx(FLOAT, LLONG, float, long_long, LLONG_MIN, LLONG_MAX);
+ H5T_CONV_Fx(FLOAT, LLONG, float, long long, LLONG_MIN, LLONG_MAX);
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -9548,7 +9548,7 @@ H5T_conv_float_ullong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
FUNC_ENTER_NOAPI(H5T_conv_float_ullong, FAIL)
- H5T_CONV_Fx(FLOAT, ULLONG, float, unsigned long_long, 0, ULLONG_MAX);
+ H5T_CONV_Fx(FLOAT, ULLONG, float, unsigned long long, 0, ULLONG_MAX);
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -9582,7 +9582,7 @@ H5T_conv_double_llong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
FUNC_ENTER_NOAPI(H5T_conv_double_llong, FAIL)
- H5T_CONV_Fx(DOUBLE, LLONG, double, long_long, LLONG_MIN, LLONG_MAX);
+ H5T_CONV_Fx(DOUBLE, LLONG, double, long long, LLONG_MIN, LLONG_MAX);
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -9616,7 +9616,7 @@ H5T_conv_double_ullong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
FUNC_ENTER_NOAPI(H5T_conv_double_ullong, FAIL)
- H5T_CONV_Fx(DOUBLE, ULLONG, double, unsigned long_long, 0, ULLONG_MAX);
+ H5T_CONV_Fx(DOUBLE, ULLONG, double, unsigned long long, 0, ULLONG_MAX);
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -9650,7 +9650,7 @@ H5T_conv_ldouble_llong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
FUNC_ENTER_NOAPI(H5T_conv_ldouble_llong, FAIL)
- H5T_CONV_Fx(LDOUBLE, LLONG, long double, long_long, LLONG_MIN, LLONG_MAX);
+ H5T_CONV_Fx(LDOUBLE, LLONG, long double, long long, LLONG_MIN, LLONG_MAX);
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -9684,7 +9684,7 @@ H5T_conv_ldouble_ullong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
FUNC_ENTER_NOAPI(H5T_conv_ldouble_ullong, FAIL)
- H5T_CONV_Fx(LDOUBLE, ULLONG, long double, unsigned long_long, 0, ULLONG_MAX);
+ H5T_CONV_Fx(LDOUBLE, ULLONG, long double, unsigned long long, 0, ULLONG_MAX);
done:
FUNC_LEAVE_NOAPI(ret_value)
diff --git a/src/H5Tnative.c b/src/H5Tnative.c
index f347d93..75b5d03 100644
--- a/src/H5Tnative.c
+++ b/src/H5Tnative.c
@@ -550,22 +550,22 @@ H5T_get_native_integer(size_t prec, H5T_sign_t sign, H5T_direction_t direction,
native_size = sizeof(long);
} else if(prec<=H5Tget_precision(H5T_NATIVE_LLONG)) {
match=H5T_NATIVE_INT_MATCH_LLONG;
- native_size = sizeof(long_long);
+ native_size = sizeof(long long);
} else { /* If no native type matches the querried datatype, simply choose the type of biggest size. */
match=H5T_NATIVE_INT_MATCH_LLONG;
- native_size = sizeof(long_long);
+ native_size = sizeof(long long);
}
} else if(direction == H5T_DIR_DESCEND) {
if(prec>=H5Tget_precision(H5T_NATIVE_LLONG)) {
match=H5T_NATIVE_INT_MATCH_LLONG;
- native_size = sizeof(long_long);
+ native_size = sizeof(long long);
} else if(prec>=H5Tget_precision(H5T_NATIVE_LONG)) {
if(prec==H5Tget_precision(H5T_NATIVE_LONG)) {
match=H5T_NATIVE_INT_MATCH_LONG;
native_size = sizeof(long);
} else {
match=H5T_NATIVE_INT_MATCH_LLONG;
- native_size = sizeof(long_long);
+ native_size = sizeof(long long);
}
}
else if(prec>=H5Tget_precision(H5T_NATIVE_INT)) {
diff --git a/src/H5Tpublic.h b/src/H5Tpublic.h
index 95539ab..330a731 100644
--- a/src/H5Tpublic.h
+++ b/src/H5Tpublic.h
@@ -388,7 +388,7 @@ H5_DLLVAR hid_t H5T_VAX_F64_g;
* precision and byte order as the last component, they have a C-like type
* name. If the type begins with `U' then it is the unsigned version of the
* integer type; other integer types are signed. The type LLONG corresponds
- * to C's `long_long' and LDOUBLE is `long double' (these types might be the
+ * to C's `long long' and LDOUBLE is `long double' (these types might be the
* same as `LONG' and `DOUBLE' respectively).
*/
#define H5T_NATIVE_CHAR (CHAR_MIN?H5T_NATIVE_SCHAR:H5T_NATIVE_UCHAR)
diff --git a/src/H5Zscaleoffset.c b/src/H5Zscaleoffset.c
index 28d8f93..10618c3 100644
--- a/src/H5Zscaleoffset.c
+++ b/src/H5Zscaleoffset.c
@@ -50,19 +50,19 @@ static herr_t H5Z_set_local_scaleoffset(hid_t dcpl_id, hid_t type_id, hid_t spac
static size_t H5Z_filter_scaleoffset(unsigned flags, size_t cd_nelmts,
const unsigned cd_values[], size_t nbytes, size_t *buf_size, void **buf);
static void H5Z_scaleoffset_convert(void *buf, unsigned d_nelmts, size_t dtype_size);
-static unsigned H5Z_scaleoffset_log2(unsigned long_long num);
+static unsigned H5Z_scaleoffset_log2(unsigned long long num);
static void H5Z_scaleoffset_precompress_i(void *data, unsigned d_nelmts,
enum H5Z_scaleoffset_type type, unsigned filavail, const void *filval_buf,
- uint32_t *minbits, unsigned long_long *minval);
+ uint32_t *minbits, unsigned long long *minval);
static void H5Z_scaleoffset_postdecompress_i(void *data, unsigned d_nelmts,
enum H5Z_scaleoffset_type type, unsigned filavail, const void *filval_buf,
- uint32_t minbits, unsigned long_long minval);
+ uint32_t minbits, unsigned long long minval);
static herr_t H5Z_scaleoffset_precompress_fd(void *data, unsigned d_nelmts,
enum H5Z_scaleoffset_type type, unsigned filavail, const void *filval_buf,
- uint32_t *minbits, unsigned long_long *minval, double D_val);
+ uint32_t *minbits, unsigned long long *minval, double D_val);
static herr_t H5Z_scaleoffset_postdecompress_fd(void *data, unsigned d_nelmts,
enum H5Z_scaleoffset_type type, unsigned filavail, const void *filval_buf,
- uint32_t minbits, unsigned long_long minval, double D_val);
+ uint32_t minbits, unsigned long long minval, double D_val);
static void H5Z_scaleoffset_next_byte(size_t *j, int *buf_len);
static void H5Z_scaleoffset_decompress_one_byte(unsigned char *data, size_t data_offset,
int k, int begin_i, unsigned char *buffer, size_t *j, int *buf_len,
@@ -188,8 +188,8 @@ H5Z_class_t H5Z_SCALEOFFSET[1] = {{
H5Z_scaleoffset_save_filval(unsigned int, cd_values, *(int *)&fill_val) \
else if(sizeof(type) == sizeof(long)) \
H5Z_scaleoffset_save_filval(unsigned long, cd_values, *(long *)&fill_val) \
- else if(sizeof(type) == sizeof(long_long)) \
- H5Z_scaleoffset_save_filval(unsigned long_long, cd_values, *(long_long *)&fill_val)\
+ else if(sizeof(type) == sizeof(long long)) \
+ H5Z_scaleoffset_save_filval(unsigned long long, cd_values, *(long long *)&fill_val)\
else \
HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "cannot find matched integer dataype")\
}
@@ -216,8 +216,8 @@ H5Z_class_t H5Z_SCALEOFFSET[1] = {{
H5Z_scaleoffset_get_filval_1(i, int, filval_buf, *(int *)&filval) \
else if(sizeof(type)==sizeof(long)) \
H5Z_scaleoffset_get_filval_1(i, long, filval_buf, *(long *)&filval) \
- else if(sizeof(type)==sizeof(long_long)) \
- H5Z_scaleoffset_get_filval_1(i, long_long, filval_buf, *(long_long *)&filval) \
+ else if(sizeof(type)==sizeof(long long)) \
+ H5Z_scaleoffset_get_filval_1(i, long long, filval_buf, *(long long *)&filval) \
else \
HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "cannot find matched integer dataype")\
}
@@ -303,10 +303,10 @@ H5Z_class_t H5Z_SCALEOFFSET[1] = {{
> HDpow(2.0, (double)(sizeof(long)*8 - 1))) { \
*minbits = sizeof(long)*8; goto done; \
} \
- } else if(sizeof(type)==sizeof(long_long)) { \
+ } else if(sizeof(type)==sizeof(long long)) { \
if(H5Z_scaleoffset_rnd(max*HDpow(10.0, D_val) - min*HDpow(10.0, D_val)) \
- > HDpow(2.0, (double)(sizeof(long_long)*8 - 1))) { \
- *minbits = sizeof(long_long)*8; goto done; \
+ > HDpow(2.0, (double)(sizeof(long long)*8 - 1))) { \
+ *minbits = sizeof(long long)*8; goto done; \
} \
} else \
HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "cannot find matched integer dataype")\
@@ -323,7 +323,7 @@ H5Z_class_t H5Z_SCALEOFFSET[1] = {{
H5Z_scaleoffset_max_min_1(i, d_nelmts, buf, filval, max, min) \
H5Z_scaleoffset_check_1(type, max, min, minbits) \
span = max - min + 1; \
- *minbits = H5Z_scaleoffset_log2((unsigned long_long)(span+1)); \
+ *minbits = H5Z_scaleoffset_log2((unsigned long long)(span+1)); \
} else /* minbits already set, only calculate min */ \
H5Z_scaleoffset_min_1(i, d_nelmts, buf, filval, min) \
if(*minbits != sizeof(type)*8) /* change values if minbits != full precision */ \
@@ -334,7 +334,7 @@ H5Z_class_t H5Z_SCALEOFFSET[1] = {{
H5Z_scaleoffset_max_min_2(i, d_nelmts, buf, max, min) \
H5Z_scaleoffset_check_1(type, max, min, minbits) \
span = max - min + 1; \
- *minbits = H5Z_scaleoffset_log2((unsigned long_long)span); \
+ *minbits = H5Z_scaleoffset_log2((unsigned long long)span); \
} else /* minbits already set, only calculate min */ \
H5Z_scaleoffset_min_2(i, d_nelmts, buf, min) \
if(*minbits != sizeof(type)*8) /* change values if minbits != full precision */ \
@@ -355,7 +355,7 @@ H5Z_class_t H5Z_SCALEOFFSET[1] = {{
H5Z_scaleoffset_max_min_1(i, d_nelmts, buf, filval, max, min) \
H5Z_scaleoffset_check_2(type, max, min, minbits) \
span = max - min + 1; \
- *minbits = H5Z_scaleoffset_log2((unsigned long_long)(span+1)); \
+ *minbits = H5Z_scaleoffset_log2((unsigned long long)(span+1)); \
} else /* minbits already set, only calculate min */ \
H5Z_scaleoffset_min_1(i, d_nelmts, buf, filval, min) \
if(*minbits != sizeof(type)*8) /* change values if minbits != full precision */ \
@@ -366,7 +366,7 @@ H5Z_class_t H5Z_SCALEOFFSET[1] = {{
H5Z_scaleoffset_max_min_2(i, d_nelmts, buf, max, min) \
H5Z_scaleoffset_check_2(type, max, min, minbits) \
span = max - min + 1; \
- *minbits = H5Z_scaleoffset_log2((unsigned long_long)span); \
+ *minbits = H5Z_scaleoffset_log2((unsigned long long)span); \
} else /* minbits already set, only calculate min */ \
H5Z_scaleoffset_min_2(i, d_nelmts, buf, min) \
if(*minbits != sizeof(type)*8) /* change values if minbits != full precision */ \
@@ -394,12 +394,12 @@ H5Z_class_t H5Z_SCALEOFFSET[1] = {{
*(long *)&buf[i] = H5Z_scaleoffset_rnd( \
buf[i]*HDpow(10.0, D_val) - min*HDpow(10.0, D_val)); \
} \
- else if(sizeof(type)==sizeof(long_long)) \
+ else if(sizeof(type)==sizeof(long long)) \
for(i = 0; i < d_nelmts; i++) { \
if(HDfabs(buf[i] - filval) < HDpow(10.0, -D_val)) \
- *(long_long *)&buf[i] = ((unsigned long_long)1 << *minbits) - 1; \
+ *(long long *)&buf[i] = ((unsigned long long)1 << *minbits) - 1; \
else \
- *(long_long *)&buf[i] = H5Z_scaleoffset_rnd( \
+ *(long long *)&buf[i] = H5Z_scaleoffset_rnd( \
buf[i]*HDpow(10.0, D_val) - min*HDpow(10.0, D_val)); \
} \
else \
@@ -417,9 +417,9 @@ H5Z_class_t H5Z_SCALEOFFSET[1] = {{
for(i = 0; i < d_nelmts; i++) \
*(long *)&buf[i] = H5Z_scaleoffset_rnd( \
buf[i]*HDpow(10.0, D_val) - min*HDpow(10.0, D_val)); \
- else if(sizeof(type)==sizeof(long_long)) \
+ else if(sizeof(type)==sizeof(long long)) \
for(i = 0; i < d_nelmts; i++) \
- *(long_long *)&buf[i] = H5Z_scaleoffset_rnd( \
+ *(long long *)&buf[i] = H5Z_scaleoffset_rnd( \
buf[i]*HDpow(10.0, D_val) - min*HDpow(10.0, D_val)); \
else \
HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "cannot find matched integer dataype")\
@@ -434,9 +434,9 @@ H5Z_class_t H5Z_SCALEOFFSET[1] = {{
else if(sizeof(type)==sizeof(long)) \
for(i = 0; i < sizeof(long); i++) \
((unsigned char *)minval)[i] = (unsigned char)((*(long *)&min & ((long)0xff << i*8)) >> i*8); \
- else if(sizeof(type)==sizeof(long_long)) \
- for(i = 0; i < sizeof(long_long); i++) \
- ((unsigned char *)minval)[i] = (unsigned char)((*(long_long *)&min & ((long_long)0xff << i*8)) >> i*8);\
+ else if(sizeof(type)==sizeof(long long)) \
+ for(i = 0; i < sizeof(long long); i++) \
+ ((unsigned char *)minval)[i] = (unsigned char)((*(long long *)&min & ((long long)0xff << i*8)) >> i*8);\
else \
HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "cannot find matched integer dataype")\
}
@@ -446,21 +446,21 @@ H5Z_class_t H5Z_SCALEOFFSET[1] = {{
minbits, minval, D_val) \
{ \
type *buf = data, min = 0, max = 0, filval = 0; \
- unsigned long_long span; unsigned i; *minval = 0; \
+ unsigned long long span; unsigned i; *minval = 0; \
\
if(filavail == H5Z_SCALEOFFSET_FILL_DEFINED) { /* fill value defined */ \
H5Z_scaleoffset_get_filval_2(i, type, filval_buf, filval) \
H5Z_scaleoffset_max_min_3(i, d_nelmts, buf, filval, max, min, D_val) \
H5Z_scaleoffset_check_3(i, type, max, min, minbits, D_val) \
span = H5Z_scaleoffset_rnd(max*HDpow(10.0,D_val) - min*HDpow(10.0,D_val)) + 1; \
- *minbits = H5Z_scaleoffset_log2((unsigned long_long)(span+1)); \
+ *minbits = H5Z_scaleoffset_log2((unsigned long long)(span+1)); \
if(*minbits != sizeof(type)*8) /* change values if minbits != full precision */ \
H5Z_scaleoffset_modify_1(i, type, buf, d_nelmts, filval, minbits, min, D_val) \
} else { /* fill value undefined */ \
H5Z_scaleoffset_max_min_2(i, d_nelmts, buf, max, min) \
H5Z_scaleoffset_check_3(i, type, max, min, minbits, D_val) \
span = H5Z_scaleoffset_rnd(max*HDpow(10.0,D_val) - min*HDpow(10.0,D_val)) + 1; \
- *minbits = H5Z_scaleoffset_log2((unsigned long_long)span); \
+ *minbits = H5Z_scaleoffset_log2((unsigned long long)span); \
if(*minbits != sizeof(type)*8) /* change values if minbits != full precision */ \
H5Z_scaleoffset_modify_2(i, type, buf, d_nelmts, min, D_val) \
} \
@@ -506,10 +506,10 @@ H5Z_class_t H5Z_SCALEOFFSET[1] = {{
for(i = 0; i < sizeof(long); i++) { \
mask = ((unsigned char *)&minval)[i]; mask <<= i*8; *(long *)&min |= mask; \
} \
- } else if(sizeof(type)==sizeof(long_long)) { \
- long_long mask; \
- for(i = 0; i < sizeof(long_long); i++) { \
- mask = ((unsigned char *)&minval)[i]; mask <<= i*8; *(long_long *)&min |= mask;\
+ } else if(sizeof(type)==sizeof(long long)) { \
+ long long mask; \
+ for(i = 0; i < sizeof(long long); i++) { \
+ mask = ((unsigned char *)&minval)[i]; mask <<= i*8; *(long long *)&min |= mask;\
} \
} else \
HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "cannot find matched integer dataype")\
@@ -526,10 +526,10 @@ H5Z_class_t H5Z_SCALEOFFSET[1] = {{
for(i = 0; i < d_nelmts; i++) \
buf[i] = (*(long *)&buf[i]==(((unsigned long)1 << minbits) - 1))? \
filval:(*(long *)&buf[i])/HDpow(10.0, D_val) + min; \
- else if(sizeof(type)==sizeof(long_long)) \
+ else if(sizeof(type)==sizeof(long long)) \
for(i = 0; i < d_nelmts; i++) \
- buf[i] = (*(long_long *)&buf[i]==(((unsigned long_long)1 << minbits) - 1))? \
- filval:(*(long_long *)&buf[i])/HDpow(10.0, D_val) + min; \
+ buf[i] = (*(long long *)&buf[i]==(((unsigned long long)1 << minbits) - 1))? \
+ filval:(*(long long *)&buf[i])/HDpow(10.0, D_val) + min; \
else \
HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "cannot find matched integer dataype") \
}
@@ -543,9 +543,9 @@ H5Z_class_t H5Z_SCALEOFFSET[1] = {{
else if(sizeof(type)==sizeof(long)) \
for(i = 0; i < d_nelmts; i++) \
buf[i] = (*(long *)&buf[i])/HDpow(10.0, D_val) + min; \
- else if(sizeof(type)==sizeof(long_long)) \
+ else if(sizeof(type)==sizeof(long long)) \
for(i = 0; i < d_nelmts; i++) \
- buf[i] = (*(long_long *)&buf[i])/HDpow(10.0, D_val) + min; \
+ buf[i] = (*(long long *)&buf[i])/HDpow(10.0, D_val) + min; \
else \
HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "cannot find matched integer dataype") \
}
@@ -651,7 +651,7 @@ H5Z_scaleoffset_get_type(unsigned dtype_class, unsigned dtype_size, unsigned dty
else if(dtype_size == sizeof(unsigned short)) type = t_ushort;
else if(dtype_size == sizeof(unsigned int)) type = t_uint;
else if(dtype_size == sizeof(unsigned long)) type = t_ulong;
- else if(dtype_size == sizeof(unsigned long_long)) type = t_ulong_long;
+ else if(dtype_size == sizeof(unsigned long long)) type = t_ulong_long;
else
HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, t_bad, "cannot find matched memory dataype")
}
@@ -661,7 +661,7 @@ H5Z_scaleoffset_get_type(unsigned dtype_class, unsigned dtype_size, unsigned dty
else if(dtype_size == sizeof(short)) type = t_short;
else if(dtype_size == sizeof(int)) type = t_int;
else if(dtype_size == sizeof(long)) type = t_long;
- else if(dtype_size == sizeof(long_long)) type = t_long_long;
+ else if(dtype_size == sizeof(long long)) type = t_long_long;
else
HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, t_bad, "cannot find matched memory dataype")
}
@@ -713,7 +713,7 @@ H5Z_scaleoffset_set_parms_fillval(H5P_genplist_t *dcpl_plist,
else if(scale_type == t_ulong)
H5Z_scaleoffset_set_filval_1(unsigned long, dcpl_plist, type, cd_values, need_convert, dxpl_id)
else if(scale_type == t_ulong_long)
- H5Z_scaleoffset_set_filval_1(unsigned long_long, dcpl_plist, type, cd_values, need_convert, dxpl_id)
+ H5Z_scaleoffset_set_filval_1(unsigned long long, dcpl_plist, type, cd_values, need_convert, dxpl_id)
else if(scale_type == t_schar)
H5Z_scaleoffset_set_filval_3(signed char, dcpl_plist, type, cd_values, need_convert, dxpl_id)
else if(scale_type == t_short)
@@ -723,7 +723,7 @@ H5Z_scaleoffset_set_parms_fillval(H5P_genplist_t *dcpl_plist,
else if(scale_type == t_long)
H5Z_scaleoffset_set_filval_2(long, dcpl_plist, type, cd_values, need_convert, dxpl_id)
else if(scale_type == t_long_long)
- H5Z_scaleoffset_set_filval_2(long_long, dcpl_plist, type, cd_values, need_convert, dxpl_id)
+ H5Z_scaleoffset_set_filval_2(long long, dcpl_plist, type, cd_values, need_convert, dxpl_id)
else if(scale_type == t_float)
H5Z_scaleoffset_set_filval_4(float, dcpl_plist, type, cd_values, need_convert, dxpl_id)
else if(scale_type == t_double)
@@ -920,7 +920,7 @@ H5Z_filter_scaleoffset (unsigned flags, size_t cd_nelmts, const unsigned cd_valu
int scale_factor = 0; /* scale factor */
double D_val = 0.0; /* decimal scale factor */
uint32_t minbits = 0; /* minimum number of bits to store values */
- unsigned long_long minval= 0; /* minimum value of input buffer */
+ unsigned long long minval= 0; /* minimum value of input buffer */
enum H5Z_scaleoffset_type type; /* memory type corresponding to dataset datatype */
int need_convert = FALSE; /* flag indicating convertion of byte order */
unsigned char *outbuf = NULL; /* pointer to new output buffer */
@@ -1009,7 +1009,7 @@ H5Z_filter_scaleoffset (unsigned flags, size_t cd_nelmts, const unsigned cd_valu
* retrieve them corresponding to how they are stored during compression
*/
uint32_t minbits_mask = 0;
- unsigned long_long minval_mask = 0;
+ unsigned long long minval_mask = 0;
unsigned minval_size = 0;
minbits = 0;
@@ -1020,11 +1020,11 @@ H5Z_filter_scaleoffset (unsigned flags, size_t cd_nelmts, const unsigned cd_valu
}
/* retrieval of minval takes into consideration situation where sizeof
- * unsigned long_long (datatype of minval) may change from compression
+ * unsigned long long (datatype of minval) may change from compression
* to decompression, only smaller size is used
*/
- minval_size = sizeof(unsigned long_long) <= ((unsigned char *)*buf)[4] ?
- sizeof(unsigned long_long) : ((unsigned char *)*buf)[4];
+ minval_size = sizeof(unsigned long long) <= ((unsigned char *)*buf)[4] ?
+ sizeof(unsigned long long) : ((unsigned char *)*buf)[4];
minval = 0;
for(i = 0; i < minval_size; i++) {
minval_mask = ((unsigned char *)*buf)[5+i];
@@ -1129,10 +1129,10 @@ H5Z_filter_scaleoffset (unsigned flags, size_t cd_nelmts, const unsigned cd_valu
for(i = 0; i < 4; i++)
((unsigned char *)outbuf)[i] = (minbits & ((uint32_t)0xff << i*8)) >> i*8;
- ((unsigned char *)outbuf)[4] = sizeof(unsigned long_long);
+ ((unsigned char *)outbuf)[4] = sizeof(unsigned long long);
- for(i = 0; i < sizeof(unsigned long_long); i++)
- ((unsigned char *)outbuf)[5+i] = (unsigned char)((minval & ((unsigned long_long)0xff << i*8)) >> i*8);
+ for(i = 0; i < sizeof(unsigned long long); i++)
+ ((unsigned char *)outbuf)[5+i] = (unsigned char)((minval & ((unsigned long long)0xff << i*8)) >> i*8);
/* special case: minbits equal to full precision */
if(minbits == p.size * 8) {
@@ -1221,11 +1221,11 @@ static double H5Z_scaleoffset_rnd(double val)
/* return ceiling of floating-point log2 function
* receive unsigned integer as argument 3/10/2005
*/
-static unsigned H5Z_scaleoffset_log2(unsigned long_long num)
+static unsigned H5Z_scaleoffset_log2(unsigned long long num)
{
unsigned v = 0;
- unsigned long_long lower_bound = 1; /* is power of 2, largest value <= num */
- unsigned long_long val = num;
+ unsigned long long lower_bound = 1; /* is power of 2, largest value <= num */
+ unsigned long long val = num;
while(val >>= 1) { v++; lower_bound <<= 1; }
@@ -1236,7 +1236,7 @@ static unsigned H5Z_scaleoffset_log2(unsigned long_long num)
/* precompress for integer type */
static void
H5Z_scaleoffset_precompress_i(void *data, unsigned d_nelmts, enum H5Z_scaleoffset_type type,
- unsigned filavail, const void *filval_buf, uint32_t *minbits, unsigned long_long *minval)
+ unsigned filavail, const void *filval_buf, uint32_t *minbits, unsigned long long *minval)
{
if(type == t_uchar)
H5Z_scaleoffset_precompress_1(unsigned char, data, d_nelmts,
@@ -1251,7 +1251,7 @@ H5Z_scaleoffset_precompress_i(void *data, unsigned d_nelmts, enum H5Z_scaleoffse
H5Z_scaleoffset_precompress_1(unsigned long, data, d_nelmts,
filavail, filval_buf, minbits, minval)
else if(type == t_ulong_long)
- H5Z_scaleoffset_precompress_1(unsigned long_long, data, d_nelmts,
+ H5Z_scaleoffset_precompress_1(unsigned long long, data, d_nelmts,
filavail, filval_buf, minbits, minval)
else if(type == t_schar) {
signed char *buf = data, min = 0, max = 0, filval = 0;
@@ -1264,7 +1264,7 @@ H5Z_scaleoffset_precompress_i(void *data, unsigned d_nelmts, enum H5Z_scaleoffse
if((unsigned char)(max - min) > (unsigned char)(~(unsigned char)0 - 2))
{ *minbits = sizeof(signed char)*8; return; }
span = max - min + 1;
- *minbits = H5Z_scaleoffset_log2((unsigned long_long)(span+1));
+ *minbits = H5Z_scaleoffset_log2((unsigned long long)(span+1));
} else /* minbits already set, only calculate min */
H5Z_scaleoffset_min_1(i, d_nelmts, buf, filval, min)
if(*minbits != sizeof(signed char)*8) /* change values if minbits != full precision */
@@ -1278,7 +1278,7 @@ H5Z_scaleoffset_precompress_i(void *data, unsigned d_nelmts, enum H5Z_scaleoffse
*minval = min; return;
}
span = max - min + 1;
- *minbits = H5Z_scaleoffset_log2((unsigned long_long)span);
+ *minbits = H5Z_scaleoffset_log2((unsigned long long)span);
} else /* minbits already set, only calculate min */
H5Z_scaleoffset_min_2(i, d_nelmts, buf, min)
if(*minbits != sizeof(signed char)*8) /* change values if minbits != full precision */
@@ -1296,16 +1296,16 @@ H5Z_scaleoffset_precompress_i(void *data, unsigned d_nelmts, enum H5Z_scaleoffse
H5Z_scaleoffset_precompress_2(long, data, d_nelmts,
filavail, filval_buf, minbits, minval)
else if(type == t_long_long)
- H5Z_scaleoffset_precompress_2(long_long, data, d_nelmts,
+ H5Z_scaleoffset_precompress_2(long long, data, d_nelmts,
filavail, filval_buf, minbits, minval)
}
/* postdecompress for integer type */
static void
H5Z_scaleoffset_postdecompress_i(void *data, unsigned d_nelmts, enum H5Z_scaleoffset_type type,
- unsigned filavail, const void *filval_buf, uint32_t minbits, unsigned long_long minval)
+ unsigned filavail, const void *filval_buf, uint32_t minbits, unsigned long long minval)
{
- long_long sminval = *(long_long*)&minval; /* for signed integer types */
+ long long sminval = *(long long*)&minval; /* for signed integer types */
if(type == t_uchar)
H5Z_scaleoffset_postdecompress_1(unsigned char, data, d_nelmts, filavail,
@@ -1320,7 +1320,7 @@ H5Z_scaleoffset_postdecompress_i(void *data, unsigned d_nelmts, enum H5Z_scaleof
H5Z_scaleoffset_postdecompress_1(unsigned long, data, d_nelmts, filavail,
filval_buf, minbits, minval)
else if(type == t_ulong_long)
- H5Z_scaleoffset_postdecompress_1(unsigned long_long, data, d_nelmts, filavail,
+ H5Z_scaleoffset_postdecompress_1(unsigned long long, data, d_nelmts, filavail,
filval_buf, minbits, minval)
else if(type == t_schar) {
signed char *buf = data, filval = 0; unsigned i;
@@ -1342,7 +1342,7 @@ H5Z_scaleoffset_postdecompress_i(void *data, unsigned d_nelmts, enum H5Z_scaleof
H5Z_scaleoffset_postdecompress_2(long, data, d_nelmts, filavail,
filval_buf, minbits, sminval)
else if(type == t_long_long)
- H5Z_scaleoffset_postdecompress_2(long_long, data, d_nelmts, filavail,
+ H5Z_scaleoffset_postdecompress_2(long long, data, d_nelmts, filavail,
filval_buf, minbits, sminval)
}
@@ -1350,7 +1350,7 @@ H5Z_scaleoffset_postdecompress_i(void *data, unsigned d_nelmts, enum H5Z_scaleof
success: non-negative, failure: negative 4/15/05 */
static herr_t
H5Z_scaleoffset_precompress_fd(void *data, unsigned d_nelmts, enum H5Z_scaleoffset_type type,
-unsigned filavail, const void *filval_buf, uint32_t *minbits, unsigned long_long *minval, double D_val)
+unsigned filavail, const void *filval_buf, uint32_t *minbits, unsigned long long *minval, double D_val)
{
herr_t ret_value=SUCCEED; /* Return value */
@@ -1371,9 +1371,9 @@ done:
success: non-negative, failure: negative 4/15/05 */
static herr_t
H5Z_scaleoffset_postdecompress_fd(void *data, unsigned d_nelmts, enum H5Z_scaleoffset_type type,
-unsigned filavail, const void *filval_buf, uint32_t minbits, unsigned long_long minval, double D_val)
+unsigned filavail, const void *filval_buf, uint32_t minbits, unsigned long long minval, double D_val)
{
- long_long sminval = *(long_long*)&minval; /* for signed integer types */
+ long long sminval = *(long long*)&minval; /* for signed integer types */
herr_t ret_value=SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5Z_scaleoffset_postdecompress_fd, FAIL)
diff --git a/src/H5Ztrans.c b/src/H5Ztrans.c
index b26a4b3..2b35786 100644
--- a/src/H5Ztrans.c
+++ b/src/H5Ztrans.c
@@ -193,9 +193,9 @@ static void H5Z_print(H5Z_node *tree, FILE *stream);
else if((TYPE) == H5T_NATIVE_ULONG) \
H5Z_XFORM_DO_OP1((RESL), (RESR), unsigned long, OP, (SIZE)) \
else if((TYPE) == H5T_NATIVE_LLONG) \
- H5Z_XFORM_LL_DO_OP1((RESL), (RESR), long_long, OP, (SIZE)) \
+ H5Z_XFORM_LL_DO_OP1((RESL), (RESR), long long, OP, (SIZE)) \
else if((TYPE) == H5T_NATIVE_ULLONG) \
- H5Z_XFORM_ULL_DO_OP1((RESL), (RESR), unsigned long_long, OP, (SIZE)) \
+ H5Z_XFORM_ULL_DO_OP1((RESL), (RESR), unsigned long long, OP, (SIZE)) \
else if((TYPE) == H5T_NATIVE_FLOAT) \
H5Z_XFORM_DO_OP1((RESL), (RESR), float, OP, (SIZE)) \
else if((TYPE) == H5T_NATIVE_DOUBLE) \
@@ -225,9 +225,9 @@ static void H5Z_print(H5Z_node *tree, FILE *stream);
else if((TYPE) == H5T_NATIVE_ULONG) \
H5Z_XFORM_DO_OP1((RESL), (RESR), unsigned long, OP, (SIZE)) \
else if((TYPE) == H5T_NATIVE_LLONG) \
- H5Z_XFORM_LL_DO_OP1((RESL), (RESR), long_long, OP, (SIZE)) \
+ H5Z_XFORM_LL_DO_OP1((RESL), (RESR), long long, OP, (SIZE)) \
else if((TYPE) == H5T_NATIVE_ULLONG) \
- H5Z_XFORM_ULL_DO_OP1((RESL), (RESR), unsigned long_long, OP, (SIZE)) \
+ H5Z_XFORM_ULL_DO_OP1((RESL), (RESR), unsigned long long, OP, (SIZE)) \
else if((TYPE) == H5T_NATIVE_FLOAT) \
H5Z_XFORM_DO_OP1((RESL), (RESR), float, OP, (SIZE)) \
else if((TYPE) == H5T_NATIVE_DOUBLE) \
@@ -942,9 +942,9 @@ H5Z_xform_eval(H5Z_data_xform_t *data_xform_prop, void* array, size_t array_size
else if(array_type == H5T_NATIVE_ULONG)
H5Z_XFORM_DO_OP5(unsigned long, array_size)
else if(array_type == H5T_NATIVE_LLONG)
- H5Z_XFORM_DO_OP5(long_long, array_size)
+ H5Z_XFORM_DO_OP5(long long, array_size)
else if(array_type == H5T_NATIVE_ULLONG)
- H5Z_XFORM_DO_OP5(unsigned long_long, array_size)
+ H5Z_XFORM_DO_OP5(unsigned long long, array_size)
else if(array_type == H5T_NATIVE_FLOAT)
H5Z_XFORM_DO_OP5(float, array_size)
else if(array_type == H5T_NATIVE_DOUBLE)
diff --git a/src/H5detect.c b/src/H5detect.c
index e29157d..b67c2b0 100644
--- a/src/H5detect.c
+++ b/src/H5detect.c
@@ -1396,8 +1396,8 @@ detect_C99_integers64(void)
#endif
#if H5_SIZEOF_LONG_LONG>0
- DETECT_I(long_long, LLONG, d_g[nd_g]); nd_g++;
- DETECT_I(unsigned long_long, ULLONG, d_g[nd_g]); nd_g++;
+ DETECT_I(long long, LLONG, d_g[nd_g]); nd_g++;
+ DETECT_I(unsigned long long, ULLONG, d_g[nd_g]); nd_g++;
#else
/*
* This architecture doesn't support an integer type larger than `long'
diff --git a/src/H5private.h b/src/H5private.h
index 2f75f86..ea55a61 100644
--- a/src/H5private.h
+++ b/src/H5private.h
@@ -404,12 +404,12 @@
* most part.
*/
#ifndef LLONG_MAX
-# define LLONG_MAX ((long_long)(((unsigned long_long)1 \
- <<(8*sizeof(long_long)-1))-1))
-# define LLONG_MIN ((long_long)(-LLONG_MAX)-1)
+# define LLONG_MAX ((long long)(((unsigned long long)1 \
+ <<(8*sizeof(long long)-1))-1))
+# define LLONG_MIN ((long long)(-LLONG_MAX)-1)
#endif
#ifndef ULLONG_MAX
-# define ULLONG_MAX ((unsigned long_long)((long_long)(-1)))
+# define ULLONG_MAX ((unsigned long long)((long long)(-1)))
#endif
#ifndef SIZET_MAX
# define SIZET_MAX ((size_t)(ssize_t)(-1))
diff --git a/src/H5public.h b/src/H5public.h
index 0697b92..e13091b 100644
--- a/src/H5public.h
+++ b/src/H5public.h
@@ -110,24 +110,6 @@ typedef int herr_t;
typedef unsigned int hbool_t;
typedef int htri_t;
-/*
- * Although `long long' is part of the revised ANSI-C some compilers don't
- * support it yet. We define `long_long' as the longest integral integer type
- * supported by the compiler, usually 64 bits. It must be legal to qualify
- * `long_long' with `unsigned'.
- */
-#if H5_SIZEOF_LONG_LONG>0
-# define long_long long long
-#elif H5_SIZEOF___INT64>0
-# define long_long __int64 /*Win32*/
-# undef H5_SIZEOF_LONG_LONG
-# define H5_SIZEOF_LONG_LONG H5_SIZEOF___INT64
-#else
-# define long_long long int
-# undef H5_SIZEOF_LONG_LONG
-# define H5_SIZEOF_LONG_LONG H5_SIZEOF_LONG
-#endif
-
/* Define the ssize_t type if it not is defined */
#if H5_SIZEOF_SSIZE_T==0
/* Undefine this size, we will re-define it in one of the sections below */
@@ -139,7 +121,7 @@ typedef int ssize_t;
typedef long ssize_t;
# define H5_SIZEOF_SSIZE_T H5_SIZEOF_LONG
#elif H5_SIZEOF_SIZE_T==H5_SIZEOF_LONG_LONG
-typedef long_long ssize_t;
+typedef long long ssize_t;
# define H5_SIZEOF_SSIZE_T H5_SIZEOF_LONG_LONG
#else /* Can't find matching type for ssize_t */
# error "nothing appropriate for ssize_t"
@@ -151,8 +133,8 @@ typedef long_long ssize_t;
* type.
*/
#if H5_SIZEOF_LONG_LONG >= 8
-typedef unsigned long_long hsize_t;
-typedef signed long_long hssize_t;
+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
#else
@@ -184,8 +166,8 @@ typedef signed long_long hssize_t;
# define HADDR_AS_MPI_TYPE MPI_UNSIGNED_LONG
# endif /* H5_HAVE_PARALLEL */
#elif H5_SIZEOF_LONG_LONG>=8
- typedef unsigned long_long haddr_t;
-# define HADDR_UNDEF ((haddr_t)(long_long)(-1))
+ typedef unsigned long long haddr_t;
+# define HADDR_UNDEF ((haddr_t)(long long)(-1))
# define H5_SIZEOF_HADDR_T H5_SIZEOF_LONG_LONG
# ifdef H5_HAVE_PARALLEL
# define HADDR_AS_MPI_TYPE MPI_LONG_LONG_INT
@@ -237,7 +219,7 @@ typedef signed long_long hssize_t;
# undef H5_SIZEOF_INT64_T
# define H5_SIZEOF_INT64_T H5_SIZEOF_LONG
#elif H5_SIZEOF_LONG_LONG>=8
- typedef long_long int64_t;
+ typedef long long int64_t;
# undef H5_SIZEOF_INT64_T
# define H5_SIZEOF_INT64_T H5_SIZEOF_LONG_LONG
#else
@@ -257,7 +239,7 @@ typedef signed long_long hssize_t;
# undef H5_SIZEOF_UINT64_T
# define H5_SIZEOF_UINT64_T H5_SIZEOF_LONG
#elif H5_SIZEOF_LONG_LONG>=8
- typedef unsigned long_long uint64_t;
+ typedef unsigned long long uint64_t;
# undef H5_SIZEOF_UINT64_T
# define H5_SIZEOF_UINT64_T H5_SIZEOF_LONG_LONG
#else
generated by cgit v0.12 at 2024-10-30 04:06:38 (GMT)