diff options
| author | Julien Malik <julien.malik@paraiso.me> | 2011-12-01 10:50:14 +0000 |
|---|---|---|
| committer | Julien Malik <julien.malik@paraiso.me> | 2011-12-01 10:50:14 +0000 |
| commit | 440adddcde73ff60c947f5c48de342c063f6aa3f (patch) | |
| tree | 68427f141d2a545e44e705d9ed88bee56fd2c84c /libopenjpeg/openjpeg.h | |
| parent | af9ad1580a4b0dc031845919f8b2429cf9888d75 (diff) | |
[trunk] fix warnings when printing large integers
Diffstat (limited to 'libopenjpeg/openjpeg.h')
| -rw-r--r-- | libopenjpeg/openjpeg.h | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/libopenjpeg/openjpeg.h b/libopenjpeg/openjpeg.h index d8a332b3..90de1d27 100644 --- a/libopenjpeg/openjpeg.h +++ b/libopenjpeg/openjpeg.h @@ -76,7 +76,7 @@ typedef int opj_bool; /*FIXME it should be to follow the name of others OPJ_TYPE #define OPJ_TRUE 1 #define OPJ_FALSE 0 -// FIXME : should be better defined by configure/CMake test +/* FIXME : should be better defined by configure/CMake test */ typedef unsigned int OPJ_UINT32; typedef int OPJ_INT32; typedef unsigned short OPJ_UINT16; @@ -88,17 +88,27 @@ typedef double OPJ_FLOAT64; typedef float OPJ_FLOAT32; #if (defined(WIN32) || defined(WIN64)) && !defined(__MINGW32__) + typedef signed __int64 OPJ_INT64; +#define OPJ_INT64_F "I64" typedef unsigned __int64 OPJ_UINT64; +#define OPJ_UINT64_F "I64" + #else + typedef long long OPJ_INT64; +#define OPJ_INT64_F "ll" + typedef unsigned long long OPJ_UINT64; +#define OPJ_UINT64_F "ll" + #endif -/* 64-bit file and blob offset type */ +/* 64-bit file offset type */ typedef OPJ_INT64 OPJ_OFF_T; +#define OPJ_OFF_F OPJ_INT64_F -// Avoid compile-time warning because parameter is not used +/* Avoid compile-time warning because parameter is not used */ #define OPJ_ARG_NOT_USED(x) (void)(x) /* |