Author: pfg
Date: Mon Jul 13 17:06:48 2015
New Revision: 1690755
URL: http://svn.apache.org/r1690755
Log:
revert r1690740 and try again.
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=1690755&r1=1690754&r2=1690755&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 Mon Jul 13
17:06:48 2015
@@ -1,11 +1,19 @@
--- misc/CoinMP-1.7.6/CoinUtils/src/CoinSignal.hpp 2011-01-03
20:31:00.000000000 -0300
+++ misc/build/CoinMP-1.7.6/CoinUtils/src/CoinSignal.hpp 2014-02-01
02:02:10.596696644 -0300
+@@ -44,7 +44,7 @@
+
//-----------------------------------------------------------------------------
+
+ #if defined(__FreeBSD__) && defined(__GNUC__)
+- typedef __decltype(SIG_DFL) CoinSighandler_t;
++ typedef typeof(SIG_DFL) CoinSighandler_t;
+ # define CoinSighandler_t_defined
+ #endif
@@ -95,7 +95,10 @@
//-----------------------------------------------------------------------------
-#if defined(__MACH__) && defined(__GNUC__)
-+#if defined(__FreeBSD__) || defined(__clang__)
++#if !defined(__FreeBSD__) && defined(__clang__)
+ typedef void(*CoinSighandler_t)(int);
+# define CoinSighandler_t_defined
+#elif defined(__MACH__) && defined(__GNUC__)
