diff options
| author | Gabriel de Dietrich <gabriel.dedietrich@digia.com> | 2013-08-05 13:58:37 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-08-05 15:54:18 +0200 |
| commit | 9baeb56ceac51755e69589536a49c6f4cfefa4b6 (patch) | |
| tree | faaf8b9b05fe27e0f0cea27c8c9cfdf67eba588c /src/3rdparty | |
| parent | c82bd369121a89fa999f41362ec904f00461b997 (diff) | |
Make libtiff link on OS X 10.9old/5.1
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 <eirik.aavitsland@digia.com>
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/libtiff/libtiff/tif_config.h | 9 |
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 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 <sys/types.h> does not define. */ /* #undef off_t */ |