cheng/libtiff
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* libtiff/tiffconf.vc.h: Build fixes based on testing.

Browse Source 
* libtiff/tif_config.vc.h: Build fixes based on testing.
This commit is contained in:
Bob Friesenhahn 2015-06-21 17:02:12 +00:00
parent 848ff19ce2
commit 47d8b0eafd
3 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,5 +1,9 @@
2015-06-21 Bob Friesenhahn <bfriesen@simple.dallas.tx.us> 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 * libtiff/libtiff.def: TIFFRasterScanline does not exist so remove
export for it. export for it.

9
libtiff/tif_config.vc.h
View File

@ -1,3 +1,6 @@
#ifndef _TIF_CONFIG_H_
#define _TIF_CONFIG_H_
/* Define to 1 if you have the <assert.h> header file. */ /* Define to 1 if you have the <assert.h> header file. */
#define HAVE_ASSERT_H 1 #define HAVE_ASSERT_H 1
@ -27,7 +30,7 @@
#define HAVE_SETMODE 1 #define HAVE_SETMODE 1
/* Define to 1 if you have the declaration of `optarg', and to 0 if you don't. */ /* 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. */ /* The size of a `int', as computed by sizeof. */
#define SIZEOF_INT 4 #define SIZEOF_INT 4
@ -119,6 +122,10 @@
#endif #endif
#define lfind _lfind #define lfind _lfind
#pragma warning(disable : 4996) /* function deprecation warnings */
#endif /* _TIF_CONFIG_H_ */
/* /*
* Local Variables: * Local Variables:
* mode: c * mode: c

25
libtiff/tiffconf.vc.h
View File

@ -55,22 +55,23 @@
/* Unsigned 64-bit type */ /* Unsigned 64-bit type */
#define TIFF_UINT64_T unsigned __int64 #define TIFF_UINT64_T unsigned __int64
#if _WIN64
/*
Windows 64-bit build
*/
/* Signed size type */ /* Signed size type */
#if defined(_WIN64) # define TIFF_SSIZE_T TIFF_INT64_T
#define TIFF_SSIZE_T signed __int64
#else
#define TIFF_SSIZE_T signed int
#endif
/* Signed size type formatter */
#if defined(_WIN64)
#define TIFF_SSIZE_FORMAT "%I64d"
#else #else
#define TIFF_SSIZE_FORMAT "%ld" /*
#endif Windows 32-bit build
*/
/* Pointer difference type */ /* Signed size type */
#define TIFF_PTRDIFF_T long # define TIFF_SSIZE_T signed int
#endif
/* Compatibility stuff. */ /* Compatibility stuff. */