include "wx/toolbar.h" instead of tbar(base|smpl).h

[wxWidgets.git] / src / tiff / tiff.h

diff --git a/src/tiff/tiff.h b/src/tiff/tiff.h
index 1904718c008627c79d48532bd36f78ff0798fedf..61d6aa408ee7a839734adbc862a9076433aace72 100644 (file)
--- a/src/tiff/tiff.h
+++ b/src/tiff/tiff.h
@@ -52,19 +52,23 @@
  * 32-bit quantities   int32/uint32
  * strings             unsigned char*
  */
+#ifndef _AIX43 /* int{8,16,32} already defined on AIX */
 #ifdef __STDC__
 typedef        signed char int8;       /* NB: non-ANSI compilers may not grok */
 #else
 typedef        char int8;
 #endif
-typedef        unsigned char uint8;
 typedef        short int16;
+#endif
+typedef        unsigned char uint8;
 typedef        unsigned short uint16;  /* sizeof (uint16) must == 2 */
 #if defined(__alpha) || (defined(_MIPS_SZLONG) && _MIPS_SZLONG == 64)
 typedef        int int32;
 typedef        unsigned int uint32;    /* sizeof (uint32) must == 4 */
 #else
+#ifndef _AIX43
 typedef        long int32;
+#endif
 typedef        unsigned long uint32;   /* sizeof (uint32) must == 4 */
 #endif
 #endif /* _TIFF_DATA_TYPEDEFS_ */