Author: pfg
Date: Wed Aug 5 01:13:43 2015
New Revision: 1694131
URL: http://svn.apache.org/r1694131
Log:
Cleanup to fix the build with MacOS X (a commercial FreeBSD derivative)
The problem is that clang defines __GNUC__, and __MACH__ is defined on
the Mac. Apparently clang on the Mac likes both the typeof(SIG_DFL) and
__decltype(SIG_DFL)__ (the latter is what the lastest CoinMP uses on the
Mac), but the with the previous version of the patch, both flavors of
typedef were defined on the Mac.
Submitted by: Don Lewis
Modified:
openoffice/trunk/ext_libraries/coinmp/coinmp-1.7.6-clang.patch
Modified: openoffice/trunk/ext_libraries/coinmp/coinmp-1.7.6-clang.patch
URL:
http://svn.apache.org/viewvc/openoffice/trunk/ext_libraries/coinmp/coinmp-1.7.6-clang.patch?rev=1694131&r1=1694130&r2=1694131&view=diff
==============================================================================
--- openoffice/trunk/ext_libraries/coinmp/coinmp-1.7.6-clang.patch (original)
+++ openoffice/trunk/ext_libraries/coinmp/coinmp-1.7.6-clang.patch Wed Aug 5
01:13:43 2015
@@ -1,25 +1,15 @@
--- misc/CoinMP-1.7.6/CoinUtils/src/CoinSignal.hpp 2011-01-03
23:31:00.000000000 +0000
-+++ misc/build/CoinMP-1.7.6/CoinUtils/src/CoinSignal.hpp 2015-07-14
00:18:26.105360000 +0000
-@@ -43,7 +43,7 @@
-
++++ misc/build/CoinMP-1.7.6/CoinUtils/src/CoinSignal.hpp 2015-08-04
23:25:43.468410000 +0000
+@@ -44,7 +44,11 @@
//-----------------------------------------------------------------------------
--#if defined(__FreeBSD__) && defined(__GNUC__)
-+#if defined(__FreeBSD__) && defined(__GNUC__) && !defined(__clang__)
- typedef typeof(SIG_DFL) CoinSighandler_t;
- # define CoinSighandler_t_defined
- #endif
-@@ -100,6 +100,13 @@
+ #if defined(__FreeBSD__) && defined(__GNUC__)
+- typedef typeof(SIG_DFL) CoinSighandler_t;
++ #if defined(__clang__)
++ typedef __decltype(SIG_DFL) CoinSighandler_t;
++ #else
++ typedef typeof(SIG_DFL) CoinSighandler_t;
++ #endif
# define CoinSighandler_t_defined
#endif
-+//-----------------------------------------------------------------------------
-+
-+#if defined(__clang__)
-+ typedef __decltype(SIG_DFL) CoinSighandler_t;
-+# define CoinSighandler_t_defined
-+#endif
-+
-
//#############################################################################
-
- #ifndef CoinSighandler_t_defined
