diff options
| author | Eirik Aavitsland <eirik.aavitsland@theqtcompany.com> | 2015-11-25 14:25:31 +0100 |
|---|---|---|
| committer | aavit <eirik.aavitsland@theqtcompany.com> | 2015-12-09 12:25:16 +0000 |
| commit | 6730d70f001c9492d32a6a8e95c304a52d7ddc35 (patch) | |
| tree | 1553ae391ec42af87ba32a52fa28f3cea2764980 /src/3rdparty/libtiff/libtiff/tiffconf.vc.h | |
| parent | de4f14476c24eb4cf52948af92220a2a6462c823 (diff) | |
Bundled libtiff updated to version 4.0.6v5.6.0-beta1
Upstream changes since 4.0.3 have been merged in. Our local tif_conf.h
have been updated according to the upstream changes in tif_conf.h.in.
Change-Id: I1c2aef6f0f60377de4876e25df723c32a6f95ea6
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
Diffstat (limited to 'src/3rdparty/libtiff/libtiff/tiffconf.vc.h')
| -rw-r--r-- | src/3rdparty/libtiff/libtiff/tiffconf.vc.h | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/src/3rdparty/libtiff/libtiff/tiffconf.vc.h b/src/3rdparty/libtiff/libtiff/tiffconf.vc.h index 680f839..c8c6c65 100644 --- a/src/3rdparty/libtiff/libtiff/tiffconf.vc.h +++ b/src/3rdparty/libtiff/libtiff/tiffconf.vc.h @@ -55,22 +55,23 @@ /* Unsigned 64-bit type */ #define TIFF_UINT64_T unsigned __int64 +#if _WIN64 +/* + Windows 64-bit build +*/ + /* Signed size type */ -#if defined(_WIN64) -#define TIFF_SSIZE_T signed __int64 -#else -#define TIFF_SSIZE_T signed int -#endif +# define TIFF_SSIZE_T TIFF_INT64_T -/* Signed size type formatter */ -#if defined(_WIN64) -#define TIFF_SSIZE_FORMAT "%I64d" #else -#define TIFF_SSIZE_FORMAT "%ld" -#endif +/* + Windows 32-bit build +*/ -/* Pointer difference type */ -#define TIFF_PTRDIFF_T long +/* Signed size type */ +# define TIFF_SSIZE_T signed int + +#endif /* Compatibility stuff. */ |