Added tests for int8, int16 and int32 types to avoid complains on some

compilers.
This commit is contained in:
Andrey Kiselev 2004-04-25 18:00:55 +00:00
parent 0c19f9ca10
commit 78927c7750

View File

@ -1,4 +1,4 @@
/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tiff.h,v 1.21 2004-01-29 19:54:51 dron Exp $ */ /* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tiff.h,v 1.22 2004-04-25 18:00:55 dron Exp $ */
/* /*
* Copyright (c) 1988-1997 Sam Leffler * Copyright (c) 1988-1997 Sam Leffler
@ -71,21 +71,30 @@ typedef unsigned int uint32;
#ifndef _TIFF_DATA_TYPEDEFS_ #ifndef _TIFF_DATA_TYPEDEFS_
#define _TIFF_DATA_TYPEDEFS_ #define _TIFF_DATA_TYPEDEFS_
#ifdef __STDC__ # ifndef HAVE_INT8
# ifdef __STDC__
typedef signed char int8; /* NB: non-ANSI compilers may not grok */ typedef signed char int8; /* NB: non-ANSI compilers may not grok */
#else # else
typedef char int8; typedef char int8;
#endif # endif
# endif
typedef unsigned char uint8; typedef unsigned char uint8;
# ifndef HAVE_INT16
typedef short int16; typedef short int16;
# endif
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) || defined(__LP64__) || defined(__arch64__) || defined(_LP64) # if defined(__alpha) || (defined(_MIPS_SZLONG) && _MIPS_SZLONG == 64) || defined(__LP64__) || defined(__arch64__) || defined(_LP64)
# ifndef HAVE_INT32
typedef int int32; typedef int int32;
# endif
typedef unsigned int uint32; /* sizeof (uint32) must == 4 */ typedef unsigned int uint32; /* sizeof (uint32) must == 4 */
#else # else
# ifndef HAVE_INT32
typedef long int32; typedef long int32;
# endif
typedef unsigned long uint32; /* sizeof (uint32) must == 4 */ typedef unsigned long uint32; /* sizeof (uint32) must == 4 */
#endif # endif
#endif /* _TIFF_DATA_TYPEDEFS_ */ #endif /* _TIFF_DATA_TYPEDEFS_ */
/* For TIFFReassignTagToIgnore */ /* For TIFFReassignTagToIgnore */