Return-Path: X-Original-To: apmail-openoffice-commits-archive@www.apache.org Delivered-To: apmail-openoffice-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 25DD618673 for ; Tue, 14 Jul 2015 02:13:51 +0000 (UTC) Received: (qmail 11722 invoked by uid 500); 14 Jul 2015 02:13:51 -0000 Delivered-To: apmail-openoffice-commits-archive@openoffice.apache.org Received: (qmail 11679 invoked by uid 500); 14 Jul 2015 02:13:51 -0000 Mailing-List: contact commits-help@openoffice.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@openoffice.apache.org Delivered-To: mailing list commits@openoffice.apache.org Received: (qmail 11670 invoked by uid 99); 14 Jul 2015 02:13:51 -0000 Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 14 Jul 2015 02:13:51 +0000 Received: from hades.apache.org (localhost [127.0.0.1]) by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id C7410AC06E8 for ; Tue, 14 Jul 2015 02:13:50 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1690854 - /openoffice/trunk/ext_libraries/coinmp/coinmp-1.7.6-clang.patch Date: Tue, 14 Jul 2015 02:13:50 -0000 To: commits@openoffice.apache.org From: pfg@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20150714021350.C7410AC06E8@hades.apache.org> Author: pfg Date: Tue Jul 14 02:13:50 2015 New Revision: 1690854 URL: http://svn.apache.org/r1690854 Log: Really fix the FreeBSD buildbot. 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=1690854&r1=1690853&r2=1690854&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 Tue Jul 14 02:13:50 2015 @@ -1,22 +1,25 @@ ---- 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 @@ +--- 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 @@ //----------------------------------------------------------------------------- --#if defined(__MACH__) && defined(__GNUC__) -+#if !defined(__FreeBSD__) && defined(__clang__) -+ typedef void(*CoinSighandler_t)(int); -+# define CoinSighandler_t_defined -+#elif defined(__MACH__) && defined(__GNUC__) +-#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 @@ + # define CoinSighandler_t_defined + #endif + ++//----------------------------------------------------------------------------- ++ ++#if defined(__clang__) ++ typedef __decltype(SIG_DFL) CoinSighandler_t; ++# define CoinSighandler_t_defined ++#endif ++ + //############################################################################# + + #ifndef CoinSighandler_t_defined