[Libreoffice-commits] .: 2 commits - salhelper/inc solenv/gbuild

[Tor Lillqvist]

 salhelper/inc/salhelper/condition.hxx |    2 -
 solenv/gbuild/platform/macosx.mk      |   46 +++++++++++++++++-----------------
 2 files changed, 24 insertions(+), 24 deletions(-)

New commits:
commit fdca78702117f5972641896c675a0e12d44557e7
Author: Tor Lillqvist <tml at iki.fi>
Date:   Fri May 11 00:28:43 2012 +0300

    It seems also nested struct needs SALHELPER_DLLPUBLIC for Mac OS X visibility
    
    Change-Id: Ifd7a248b49a00df2e01f537074d0a94e9de09b10

diff --git a/salhelper/inc/salhelper/condition.hxx b/salhelper/inc/salhelper/condition.hxx
index c50bc87..befa43f 100644
--- a/salhelper/inc/salhelper/condition.hxx
+++ b/salhelper/inc/salhelper/condition.hxx
@@ -92,7 +92,7 @@ namespace salhelper
 
         ConditionWaiter(Condition& aCond);
 
-        struct timedout {
+        struct SALHELPER_DLLPUBLIC timedout {
             timedout();
 
             timedout(timedout const &);
commit 991e3520bc09a66504819d05807f10aa8de805ce
Author: Tor Lillqvist <tml at iki.fi>
Date:   Thu May 10 23:45:38 2012 +0300

    Argh, make the use of -fvisibility=hidden actually happen
    
    Move initialisations of gb_CFLAGS and gb_CXXFLAGS earlier, like in
    unxgcc.mk.
    
    Change-Id: I2382edad42f0f52bcbb062ec6930e2cfe12ec8ca

diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 5ad4f3d..3348853 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -47,6 +47,29 @@ gb_OSDEFS := \
 	$(EXTRA_CDEFS) \
 
 
+gb_CFLAGS := \
+	-isysroot $(gb_SDKDIR) \
+	$(gb_CFLAGS_COMMON) \
+	-fPIC \
+	-fno-strict-aliasing \
+    #-Wshadow \ break in compiler headers already
+
+# For -Wno-non-virtual-dtor see <http://markmail.org/message/664jsoqe6n6smy3b>
+# "Re: [dev] warnings01: -Wnon-virtual-dtor" message to dev at openoffice.org from
+# Feb 1, 2006:
+gb_CXXFLAGS := \
+	-isysroot $(gb_SDKDIR) \
+	$(gb_CXXFLAGS_COMMON) \
+	-fPIC \
+	-Wno-ctor-dtor-privacy \
+	-Wno-non-virtual-dtor \
+	-fno-strict-aliasing \
+	-fsigned-char \
+	$(if $(filter TRUE,$(COM_GCC_IS_CLANG)),,-malign-natural) \
+	#-Wshadow \ break in compiler headers already
+	#-fsigned-char \ might be removed?
+	#-malign-natural \ might be removed?
+
 ifeq ($(HAVE_GCC_VISIBILITY_FEATURE),TRUE)
 gb_COMPILERDEFS += \
 	-DHAVE_GCC_VISIBILITY_FEATURE \
@@ -71,29 +94,6 @@ gb_COMPILERDEFS += \
 
 endif
 
-gb_CFLAGS := \
-	-isysroot $(gb_SDKDIR) \
-	$(gb_CFLAGS_COMMON) \
-	-fPIC \
-	-fno-strict-aliasing \
-    #-Wshadow \ break in compiler headers already
-
-# For -Wno-non-virtual-dtor see <http://markmail.org/message/664jsoqe6n6smy3b>
-# "Re: [dev] warnings01: -Wnon-virtual-dtor" message to dev at openoffice.org from
-# Feb 1, 2006:
-gb_CXXFLAGS := \
-	-isysroot $(gb_SDKDIR) \
-	$(gb_CXXFLAGS_COMMON) \
-	-fPIC \
-	-Wno-ctor-dtor-privacy \
-	-Wno-non-virtual-dtor \
-	-fno-strict-aliasing \
-	-fsigned-char \
-	$(if $(filter TRUE,$(COM_GCC_IS_CLANG)),,-malign-natural) \
-	#-Wshadow \ break in compiler headers already
-	#-fsigned-char \ might be removed?
-	#-malign-natural \ might be removed?
-
 ifeq ($(HAVE_GCC_NO_LONG_DOUBLE),TRUE)
 gb_CXXFLAGS += -Wno-long-double
 endif