diff options
| author | Brody <brody@ieee.org> | 2013-12-11 05:46:04 (GMT) |
|---|---|---|
| committer | Brody <brody@ieee.org> | 2013-12-11 05:46:04 (GMT) |
| commit | ef92a395a8498230921fe3d5edb694c2388fdbb9 (patch) | |
| tree | 1d51892f9cf9b61fdf01eac2f8e95a6e32c54a1d /patches/qt4/patch-libtiff.diff | |
| parent | d7d5bea7363703c76b9787598304bfc838e893ee (diff) | |
| parent | 50fb5bb135f62ed56230d8b8afd691284616b4f6 (diff) | |
Merge pull request #1 from openscad/brodykenrick-master
Brodykenrick master
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 */ + |