From 9baeb56ceac51755e69589536a49c6f4cfefa4b6 Mon Sep 17 00:00:00 2001 From: Gabriel de Dietrich Date: Mon, 5 Aug 2013 13:58:37 +0200 Subject: Make libtiff link on OS X 10.9 Undefining the 'inline' keyword doesn't look very wise nowadays, and it did cause duplicate symbol erros at link time when linking against the 10.9 SDK. Change-Id: Ie6f8639fb920e57289c7d0ad8952603abcfe7377 Reviewed-by: aavit --- src/3rdparty/libtiff/libtiff/tif_config.h | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/3rdparty/libtiff/libtiff/tif_config.h b/src/3rdparty/libtiff/libtiff/tif_config.h index dc579c3..dfe9d3c 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 does not define. */ /* #undef off_t */ -- cgit v1.2.3