Mercurial > hg > dmlib
changeset 2393:85700c9b7dc8
Add new DM_PRI*_OFF_T specifiers for off_t type.
author | Matti Hamalainen <ccr@tnsp.org> |
---|---|
date | Thu, 09 Jan 2020 20:54:57 +0200 |
parents | 835b231d8083 |
children | 147d40b708ea |
files | src/dmlib.h tools/libgfx.c |
diffstat | 2 files changed, 14 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/dmlib.h Thu Jan 09 20:54:39 2020 +0200 +++ b/src/dmlib.h Thu Jan 09 20:54:57 2020 +0200 @@ -71,17 +71,26 @@ # define DM_PRId_SSIZE_T PRId32 # define DM_PRIx_SIZE_T PRIx32 # define DM_PRIX_SIZE_T PRIX32 +# define DM_PRId_OFF_T "ld" +# define DM_PRIx_OFF_T "lx" +# define DM_PRIX_OFF_T "lX" #elif DM_ARCH == 64 # ifdef DM_WINDOWS # define DM_PRIu_SIZE_T "I64u" # define DM_PRId_SSIZE_T "I64d" # define DM_PRIx_SIZE_T "I64x" # define DM_PRIX_SIZE_T "I64X" +# define DM_PRId_OFF_T "I64d" +# define DM_PRIx_OFF_T "I64x" +# define DM_PRIX_OFF_T "I64X" # else # define DM_PRIu_SIZE_T PRIu64 # define DM_PRId_SSIZE_T PRId64 # define DM_PRIx_SIZE_T PRIx64 # define DM_PRIX_SIZE_T PRIX64 +# define DM_PRId_OFF_T PRId64 +# define DM_PRIx_OFF_T PRIx64 +# define DM_PRIX_OFF_T PRIX64 # endif #else # error Could not determine architecture (32/64bit), please define DM_ARCH=32 or 64
--- a/tools/libgfx.c Thu Jan 09 20:54:39 2020 +0200 +++ b/tools/libgfx.c Thu Jan 09 20:54:57 2020 +0200 @@ -2102,17 +2102,17 @@ if (size & 1) { - dmMsg(3, "IFF: Chunk size %" DM_PRIu_SIZE_T - " is uneven, adjusting to %" DM_PRIu_SIZE_T ".\n", + dmMsg(3, "IFF: Chunk size %" DM_PRId_OFF_T + " is uneven, adjusting to %" DM_PRId_OFF_T ".\n", size, size + 1); size++; } if (size > read) { - dmMsg(3, "IFF: Skipping %" DM_PRIu_SIZE_T - " bytes (%" DM_PRIu_SIZE_T - " of %" DM_PRIu_SIZE_T " consumed)\n", + dmMsg(3, "IFF: Skipping %" DM_PRId_OFF_T + " bytes (%" DM_PRId_OFF_T + " of %" DM_PRId_OFF_T " consumed)\n", size - read, read, size); if (dmfseek(fp, size - read, SEEK_CUR) != 0)