* libtiff/tiffconf.vc.h: Build fixes based on testing.
* libtiff/tif_config.vc.h: Build fixes based on testing.
This commit is contained in:
parent
848ff19ce2
commit
47d8b0eafd
@ -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.
|
||||
|
||||
|
@ -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
|
||||
|
@ -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. */
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user