diff options
| author | Janne Anttila <janne.anttila@digia.com> | 2009-07-30 06:52:18 (GMT) |
|---|---|---|
| committer | Janne Anttila <janne.anttila@digia.com> | 2009-07-30 06:52:18 (GMT) |
| commit | 3ac8079726f326a60fd6216139265587f66dc1bf (patch) | |
| tree | 995be75dd8680fd5e7d428068598b1ccf978df8d | |
| parent | ab2d49bcea3cdf90c6c5702fba2bdc4e5c1986c1 (diff) | |
| download | Qt-3ac8079726f326a60fd6216139265587f66dc1bf.zip Qt-3ac8079726f326a60fd6216139265587f66dc1bf.tar.gz Qt-3ac8079726f326a60fd6216139265587f66dc1bf.tar.bz2 | |
Removed tiff libarary warning: `inline' redefined.
Since inline is defined by platform, it should be safe to leave it
as is, and not to tuch the definition here at all.
| -rw-r--r-- | src/3rdparty/libtiff/libtiff/tif_config.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/3rdparty/libtiff/libtiff/tif_config.h b/src/3rdparty/libtiff/libtiff/tif_config.h index 324fbe8..f6da51b 100644 --- a/src/3rdparty/libtiff/libtiff/tif_config.h +++ b/src/3rdparty/libtiff/libtiff/tif_config.h @@ -284,10 +284,12 @@ /* 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' if <sys/types.h> does not define. */ /* #undef off_t */ |