mirror of https://github.com/vitalif/openscad
Qt4 patches to make it build on 10.9
parent
89c21d07c4
commit
301ef946f0
|
@ -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 */
|
||||||
|
|
|
@ -0,0 +1,14 @@
|
||||||
|
--- src/corelib/global/qglobal.h.orig 2013-06-07 07:16:52.000000000 +0200
|
||||||
|
+++ src/corelib/global/qglobal.h 2013-10-27 14:05:22.000000000 +0100
|
||||||
|
@@ -327,7 +327,10 @@
|
||||||
|
# if !defined(MAC_OS_X_VERSION_10_8)
|
||||||
|
# define MAC_OS_X_VERSION_10_8 MAC_OS_X_VERSION_10_7 + 1
|
||||||
|
# endif
|
||||||
|
-# if (MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_8)
|
||||||
|
+# if !defined(MAC_OS_X_VERSION_10_9)
|
||||||
|
+# define MAC_OS_X_VERSION_10_9 MAC_OS_X_VERSION_10_8 + 1
|
||||||
|
+# endif
|
||||||
|
+# if (MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_9)
|
||||||
|
# warning "This version of Mac OS X is unsupported"
|
||||||
|
# endif
|
||||||
|
#endif
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue