added check for __LP64__ for 64bit architectures as per bugzilla bug 67

This commit is contained in:
Frank Warmerdam 2001-08-10 02:37:52 +00:00
parent c997939e76
commit 66ca643de3
3 changed files with 9 additions and 4 deletions

View File

@ -1,3 +1,8 @@
2001-08-09 Frank Warmerdam <warmerdam@pobox.com>
* libtiff/tiff.h, libtiff/tif_fax3.c: added check for __LP64__
when checking for 64 bit architectures as per bugzilla bug 67.
2001-07-27 Frank Warmerdam <warmerdam@pobox.com> 2001-07-27 Frank Warmerdam <warmerdam@pobox.com>
* man/Makefile.in: add TIFFClientOpen link as per debian submitted * man/Makefile.in: add TIFFClientOpen link as per debian submitted

View File

@ -1,4 +1,4 @@
/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_fax3.c,v 1.13 2001-01-23 14:45:58 warmerda Exp $ */ /* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_fax3.c,v 1.14 2001-08-10 02:37:52 warmerda Exp $ */
/* /*
* Copyright (c) 1990-1997 Sam Leffler * Copyright (c) 1990-1997 Sam Leffler
@ -321,7 +321,7 @@ Fax3Decode2D(TIFF* tif, tidata_t buf, tsize_t occ, tsample_t s)
* this is <8 bytes. We optimize the code here to reflect the * this is <8 bytes. We optimize the code here to reflect the
* machine characteristics. * machine characteristics.
*/ */
#if defined(__alpha) || _MIPS_SZLONG == 64 #if defined(__alpha) || _MIPS_SZLONG == 64 || defined(__LP64__)
#define FILL(n, cp) \ #define FILL(n, cp) \
switch (n) { \ switch (n) { \
case 15:(cp)[14] = 0xff; case 14:(cp)[13] = 0xff; case 13: (cp)[12] = 0xff;\ case 15:(cp)[14] = 0xff; case 14:(cp)[13] = 0xff; case 13: (cp)[12] = 0xff;\

View File

@ -1,4 +1,4 @@
/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tiff.h,v 1.7 2001-04-03 04:00:23 warmerda Exp $ */ /* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tiff.h,v 1.8 2001-08-10 02:37:52 warmerda Exp $ */
/* /*
* Copyright (c) 1988-1997 Sam Leffler * Copyright (c) 1988-1997 Sam Leffler
@ -79,7 +79,7 @@ typedef char int8;
typedef unsigned char uint8; typedef unsigned char uint8;
typedef short int16; typedef short int16;
typedef unsigned short uint16; /* sizeof (uint16) must == 2 */ typedef unsigned short uint16; /* sizeof (uint16) must == 2 */
#if defined(__alpha) || (defined(_MIPS_SZLONG) && _MIPS_SZLONG == 64) #if defined(__alpha) || (defined(_MIPS_SZLONG) && _MIPS_SZLONG == 64) || defined(__LP64__)
typedef int int32; typedef int int32;
typedef unsigned int uint32; /* sizeof (uint32) must == 4 */ typedef unsigned int uint32; /* sizeof (uint32) must == 4 */
#else #else