diff options
| author | Don Bright <hugh.m.bright@gmail.com> | 2013-12-15 21:32:06 (GMT) |
|---|---|---|
| committer | Don Bright <hugh.m.bright@gmail.com> | 2013-12-15 21:32:06 (GMT) |
| commit | 3b3ef44f6636affef8138f4c8b7dec1333f50377 (patch) | |
| tree | 977698cc6d2d56775f140967792ad637db03490f /patches/qt4/patch-libtiff.diff | |
| parent | 5271b345bc755f37e98d7f497f6686d34990fa5c (diff) | |
| parent | c7cea0082e427f3c53985845f05e8737873c8a25 (diff) | |
Merge branch 'master' of github.com:openscad/openscad into planar
Conflicts:
src/CGAL_Nef_polyhedron.cc
tests/CMakeLists.txt
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 */ + |