diff options
| author | bfriesen <bfriesen> | 2015-06-21 17:02:12 +0000 |
|---|---|---|
| committer | bfriesen <bfriesen> | 2015-06-21 17:02:12 +0000 |
| commit | d0ea225ea405b2ce1565295f423b63f6e6f34c38 (patch) | |
| tree | 06d75997f28c418c595141c3b1457d7e076da462 | |
| parent | f21fb6231c5b956b8099a02ccfff16f7ab29a134 (diff) | |
| download | libtiff-d0ea225ea405b2ce1565295f423b63f6e6f34c38.tar.gz | |
* libtiff/tiffconf.vc.h: Build fixes based on testing.
* libtiff/tif_config.vc.h: Build fixes based on testing.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | libtiff/tif_config.vc.h | 9 | ||||
| -rw-r--r-- | libtiff/tiffconf.vc.h | 25 |
3 files changed, 25 insertions, 13 deletions
@@ -1,5 +1,9 @@ 2015-06-21 Bob Friesenhahn <bfriesen@simple.dallas.tx.us> + * libtiff/tiffconf.vc.h: Build fixes based on testing. + + * libtiff/tif_config.vc.h: Build fixes based on testing. + * libtiff/libtiff.def: TIFFRasterScanline does not exist so remove export for it. diff --git a/libtiff/tif_config.vc.h b/libtiff/tif_config.vc.h index cdccf3d4..7e6c5c27 100644 --- a/libtiff/tif_config.vc.h +++ b/libtiff/tif_config.vc.h @@ -1,3 +1,6 @@ +#ifndef _TIF_CONFIG_H_ +#define _TIF_CONFIG_H_ + /* Define to 1 if you have the <assert.h> header file. */ #define HAVE_ASSERT_H 1 @@ -27,7 +30,7 @@ #define HAVE_SETMODE 1 /* Define to 1 if you have the declaration of `optarg', and to 0 if you don't. */ -#define HAVE_DECL_OPTARG 1 +#define HAVE_DECL_OPTARG 0 /* The size of a `int', as computed by sizeof. */ #define SIZEOF_INT 4 @@ -119,6 +122,10 @@ #endif #define lfind _lfind + +#pragma warning(disable : 4996) /* function deprecation warnings */ + +#endif /* _TIF_CONFIG_H_ */ /* * Local Variables: * mode: c diff --git a/libtiff/tiffconf.vc.h b/libtiff/tiffconf.vc.h index 680f839f..c8c6c656 100644 --- a/libtiff/tiffconf.vc.h +++ b/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. */ |