https://github.com/libsdl-org/libtiff/commit/c0e3f8cddebc91966fb590992743aa9d2b49d5b2
From c0e3f8cddebc91966fb590992743aa9d2b49d5b2 Mon Sep 17 00:00:00 2001
From: Frank Warmerdam <[EMAIL REDACTED]>
Date: Mon, 21 Mar 2011 21:09:19 +0000
Subject: [PATCH] avoid declaring uint64/int64 on AIX where it is already
available (#2301)
---
ChangeLog | 5 ++++-
libtiff/tiffiop.h | 7 +++++--
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index a81e6537..1ac7deb3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
-2011-03-12 Frank Warmerdam <warmerdam@pobox.com>
+2011-03-21 Frank Warmerdam <warmerdam@pobox.com>
+
+ * libtiff/tiffiop.h: avoid declaring int64/uint64 on AIX with XLC
+ where they are already available. (#2301)
* libtiff/tif_thunder.c: Correct potential buffer overflow with
thunder encoded files with wrong bitspersample set. The libtiff
diff --git a/libtiff/tiffiop.h b/libtiff/tiffiop.h
index a064039f..f65f8550 100644
--- a/libtiff/tiffiop.h
+++ b/libtiff/tiffiop.h
@@ -1,4 +1,4 @@
-/* $Id: tiffiop.h,v 1.51.2.6 2010-06-12 02:55:16 bfriesen Exp $ */
+/* $Id: tiffiop.h,v 1.51.2.7 2011-03-21 21:09:19 fwarmerdam Exp $ */
/*
* Copyright (c) 1988-1997 Sam Leffler
@@ -59,10 +59,13 @@ extern void *lfind(const void *, const void *, size_t *, size_t,
/*
Libtiff itself does not require a 64-bit type, but bundled TIFF
- utilities may use it.
+ utilities may use it.
*/
+
+#if !defined(__xlC__) && !defined(__xlc__) // Already defined there (#2301)
typedef TIFF_INT64_T int64;
typedef TIFF_UINT64_T uint64;
+#endif
#include "tiffio.h"
#include "tif_dir.h"