diff options
| author | Marius Kintel <marius@kintel.net> | 2013-12-09 04:12:13 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2013-12-09 04:12:13 (GMT) |
| commit | 462d4d447885594629fefb8a658f9f1d079bcc44 (patch) | |
| tree | 6690951e4f814b87a1a372a913b75ceda1f6cc1a /patches/qt4/patch-libtiff.diff | |
| parent | 435e0c021c5018ee5de69d3218c3e31c8ab75be5 (diff) | |
| parent | 33c34b6f7c43d19bbfa3bf91e7b577bcc062e5bd (diff) | |
Merge branch 'master' into travis
Diffstat (limited to 'patches/qt4/patch-libtiff.diff')
| -rw-r--r-- | patches/qt4/patch-libtiff.diff | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/patches/qt4/patch-libtiff.diff b/patches/qt4/patch-libtiff.diff new file mode 100644 index 0000000..5b7f9ec --- /dev/null +++ b/patches/qt4/patch-libtiff.diff @@ -0,0 +1,18 @@ +--- src/3rdparty/libtiff/libtiff/tif_config.h ++++ 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 */ + |