diff options
| author | Peter Foley <pefoley2@verizon.net> | 2012-12-05 19:41:32 -0500 |
|---|---|---|
| committer | Peter Foley <pefoley2@verizon.net> | 2012-12-05 19:45:36 -0500 |
| commit | 0743ccea543dfcad5c4875b943330fd894a5132a (patch) | |
| tree | dcbb263c03bffb4509f53504631f444d948bf56e /sd | |
| parent | dont create warn file if no warnings (diff) | |
| download | core-0743ccea543dfcad5c4875b943330fd894a5132a.tar.gz core-0743ccea543dfcad5c4875b943330fd894a5132a.zip | |
define must be overridden on cmdline
Change-Id: If85a60d9db69ab96c8a77b7715fc2a51fcd7ba51
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/Library_sd.mk | 1 | ||||
| -rw-r--r-- | sd/source/ui/remotecontrol/BluetoothServer.cxx | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk index 6390e1135f38..449b761faa0c 100644 --- 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 diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx b/sd/source/ui/remotecontrol/BluetoothServer.cxx index 9ba9badc46ca..63be65e6577b 100644 --- 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 |