[Libreoffice-commits] core.git: sd/Library_sd.mk sd/source

Norbert Thiebaud nthiebaud at gmail.com
Sun Feb 17 08:08:50 PST 2013


 sd/Library_sd.mk                           |    3 ++-
 sd/source/ui/remotecontrol/OSXBluetooth.mm |    7 -------
 2 files changed, 2 insertions(+), 8 deletions(-)

New commits:
commit c21916ad8a315a9dd7f23bf9aef0576975470a5a
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Sun Feb 17 10:08:01 2013 -0600

    pragma GCC diagnostic is not available for 4.0.1
    
    Change-Id: I4aa9fb45c391c8b17d713e77a8a6e3338005441b

diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index 4967845..6a967c5 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -543,7 +543,8 @@ else
 
 $(eval $(call gb_Library_add_objcxxobjects,sd,\
     sd/source/ui/remotecontrol/BluetoothServer \
-    sd/source/ui/remotecontrol/OSXBluetooth \
+    sd/source/ui/remotecontrol/OSXBluetooth,\
+    -Wno-error \
 ))
 
 $(eval $(call gb_Library_add_libs,sd,\
diff --git a/sd/source/ui/remotecontrol/OSXBluetooth.mm b/sd/source/ui/remotecontrol/OSXBluetooth.mm
index 1d4a3f0..ef1b700 100644
--- a/sd/source/ui/remotecontrol/OSXBluetooth.mm
+++ b/sd/source/ui/remotecontrol/OSXBluetooth.mm
@@ -6,7 +6,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-
 #include <osl/conditn.hxx> // Include this early to avoid error as check() gets defined by some SDK header to empty
 
 #include <premac.h>
@@ -43,12 +42,6 @@
     pSocket = NULL;
 }
 
-// The Xcode 3 compiler warns if we don't implement all methods of the
-// IOBluetoothRFCOMMChannelDelegate protocol. In later SDKs they are
-// marked as @optional.
-
-#pragma GCC diagnostic ignored "-Wprotocol"
-
 @end
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */


More information about the Libreoffice-commits mailing list