diff options
| author | Marius Kintel <marius@kintel.net> | 2013-12-06 06:08:29 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2013-12-06 06:08:29 (GMT) |
| commit | 941b56e7f851f1cdb987224ec49310062d2400d3 (patch) | |
| tree | ffad8bf0554463b3f2869ae697e86b18bce9840d /patches/qt4/patch-libtiff.diff | |
| parent | f2fe074e1d947f74e34833453cc613e46e5450a6 (diff) | |
| parent | ede5c4b6882692dc28fc7017c4aeb87ec9222f8e (diff) | |
Merge branch 'master' of github.com:openscad/openscad
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 */ + |