diff options
Diffstat (limited to 'src/libtiff')
-rw-r--r-- | src/libtiff/tif_config.h | 28 | ||||
-rw-r--r-- | src/libtiff/tiffiop.h | 6 |
2 files changed, 3 insertions, 31 deletions
diff --git a/src/libtiff/tif_config.h b/src/libtiff/tif_config.h index 3558fe7..f9db461 100644 --- a/src/libtiff/tif_config.h +++ b/src/libtiff/tif_config.h @@ -253,34 +253,6 @@ #define inline #endif -#ifdef _MSC_VER -#if _MSC_VER>1400 -/* Signed 64-bit type formatter */ -#define TIFF_INT64_FORMAT "%I64d" - -/* Signed 64-bit type */ -#define TIFF_INT64_T signed __int64 - -/* Unsigned 64-bit type formatter */ -#define TIFF_UINT64_FORMAT "%I64u" - -/* Unsigned 64-bit type */ -#define TIFF_UINT64_T unsigned __int64 -//#else -///* Signed 64-bit type formatter */ -//#define TIFF_INT64_FORMAT "%I64d" -// -///* Signed 64-bit type */ -//#define TIFF_INT64_T signed __int64 -// -///* Unsigned 64-bit type formatter */ -//#define TIFF_UINT64_FORMAT "%I64u" -// -///* Unsigned 64-bit type */ -//#define TIFF_UINT64_T unsigned __int64 -#endif -#endif - /* Define to `long' if <sys/types.h> does not define. */ /* #undef off_t */ diff --git a/src/libtiff/tiffiop.h b/src/libtiff/tiffiop.h index dcf9a63..3360b7a 100644 --- a/src/libtiff/tiffiop.h +++ b/src/libtiff/tiffiop.h @@ -1,4 +1,4 @@ -/* $Id: tiffiop.h,v 1.2 2009/08/21 04:01:59 scuri Exp $ */ +/* $Id: tiffiop.h,v 1.3 2009/08/22 04:31:04 scuri Exp $ */ /* * Copyright (c) 1988-1997 Sam Leffler @@ -61,8 +61,8 @@ extern void *lfind(const void *, const void *, size_t *, size_t, Libtiff itself does not require a 64-bit type, but bundled TIFF utilities may use it. */ -typedef TIFF_INT64_T int64; -typedef TIFF_UINT64_T uint64; +/* typedef TIFF_INT64_T int64; IMLIB */ +/* typedef TIFF_UINT64_T uint64; IMLIB */ #include "tiffio.h" #include "tif_dir.h" |