summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJake Petroules <jake.petroules@petroules.com>2013-08-05 14:06:35 (GMT)
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-08-05 15:03:28 (GMT)
commit3c5f501ffcc31b885d8b4f8162cac85c6fe62734 (patch)
tree7fdf4d2dbf11c459d0fa3850443510a7168aec07
parent719adaaa12991530d066bef4b65257ef66dd951c (diff)
downloadQt-3c5f501ffcc31b885d8b4f8162cac85c6fe62734.zip
Qt-3c5f501ffcc31b885d8b4f8162cac85c6fe62734.tar.gz
Qt-3c5f501ffcc31b885d8b4f8162cac85c6fe62734.tar.bz2
Make libtiff link on OS X 10.9.
Backport of Ie6f8639fb920e57289c7d0ad8952603abcfe7377. Change-Id: I9d0cd625734fda88a9564d4fef7b1f5e9f22c774 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
-rw-r--r--src/3rdparty/libtiff/libtiff/tif_config.h9
1 files changed, 0 insertions, 9 deletions
diff --git a/src/3rdparty/libtiff/libtiff/tif_config.h b/src/3rdparty/libtiff/libtiff/tif_config.h
index f851384..97faf38 100644
--- a/src/3rdparty/libtiff/libtiff/tif_config.h
+++ b/src/3rdparty/libtiff/libtiff/tif_config.h
@@ -317,15 +317,6 @@
/* Define to empty if `const' does not conform to ANSI C. */
/* #undef const */
-/* Define to `__inline__' or `__inline' if that's what the C compiler
- calls it, or to nothing if 'inline' is not supported under any name. */
-#ifndef Q_OS_SYMBIAN
-#ifndef __cplusplus
-#undef inline
-#define inline
-#endif
-#endif
-
/* Define to `long int' if <sys/types.h> does not define. */
/* #undef off_t */