define must be overridden on cmdline

Change-Id: If85a60d9db69ab96c8a77b7715fc2a51fcd7ba51

define must be overridden on cmdline
Change-Id: If85a60d9db69ab96c8a77b7715fc2a51fcd7ba51
0743ccea · Peter Foley · 0f6286ae · 0743ccea · 0743ccea
Kaydet (Commit) 0743ccea authored Ara 06, 2012 tarafından Peter Foley
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

Library_sd.mk sd/Library_sd.mk +1 -0

BluetoothServer.cxx sd/source/ui/remotecontrol/BluetoothServer.cxx +0 -1

No files found.
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -534,6 +534,7 @@ $(eval $(call gb_Library_add_exception_objects,sd,\

 $(eval $(call gb_Library_add_defs,sd,\
    -DENABLE_SDREMOTE_BLUETOOTH \
+	$(if $(filter MSC,$(COM)),-UMSC) \
 ))
 endif


--- a/sd/source/ui/remotecontrol/BluetoothServer.cxx
+++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx
@@ -28,7 +28,6 @@
 #endif

 #ifdef WIN32
-  #undef MSC // Unset a legacy define, as otherwise ws2bth.h breaks
  #include <winsock2.h>
  #include <ws2bth.h>
 #endif