diff options
| author | Peter Foley <pefoley2@verizon.net> | 2012-12-15 09:22:07 -0500 |
|---|---|---|
| committer | Peter Foley <pefoley2@verizon.net> | 2012-12-15 09:39:25 -0500 |
| commit | f7e37ae44f018720974ac6e241488904f3b666ee (patch) | |
| tree | 90308241a369b9d8a698a253c8f840f3f697aa4e /sd | |
| parent | 4f901a2f451a552853c1dd38309dd55b22616fdd (diff) | |
Revert "define must be overridden on cmdline"
This reverts commit 0743ccea543dfcad5c4875b943330fd894a5132a.
This seems to be unnecessary and generates a lot of warning spam.
Conflicts:
sd/source/ui/remotecontrol/BluetoothServer.cxx
Change-Id: Ib0cda3ca560a5ddc4ba86d5a0c80774a992d7296
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/Library_sd.mk | 1 | ||||
| -rw-r--r-- | sd/source/ui/remotecontrol/BluetoothServer.cxx | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk index 9aeeaffc6539..b0946eb0c1d4 100644 --- a/sd/Library_sd.mk +++ b/sd/Library_sd.mk @@ -537,7 +537,6 @@ $(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 2db2f1fbce92..22ca95b56948 100644 --- a/sd/source/ui/remotecontrol/BluetoothServer.cxx +++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx @@ -32,7 +32,7 @@ // LO vs WinAPI conflict #undef WB_LEFT #undef WB_RIGHT - + #undef MSC // Unset a legacy define, as otherwise ws2bth.h breaks #include <winsock2.h> #include <ws2bth.h> #endif |