diff options
| author | Luboš Luňák <l.lunak@suse.cz> | 2012-12-21 11:17:38 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2013-02-13 11:28:19 +0000 |
| commit | 7d3a1616ee4d3f91394f5d807769d53289fd56e0 (patch) | |
| tree | 07f840cf479a45a604edb149c6b336e67c5ae4ef | |
| parent | 27a69f957dc981ed42d594a8a4ebf9baba08d372 (diff) | |
ugly workaround for msvc+ccache problem with gbuild MSC define
and squash remove no longer needed hack
Conflicts:
sd/source/ui/remotecontrol/BluetoothServer.cxx
Change-Id: I06ab10df77e2b3598f7268173206429596a50217
Signed-off-by: Michael Meeks <michael.meeks@suse.com>
| -rw-r--r-- | sd/source/ui/remotecontrol/BluetoothServer.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx b/sd/source/ui/remotecontrol/BluetoothServer.cxx index 8c695b694f99..f676b5efef2d 100644 --- a/sd/source/ui/remotecontrol/BluetoothServer.cxx +++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx @@ -28,7 +28,9 @@ #endif #ifdef WIN32 - #undef MSC // Unset a legacy define, as otherwise ws2bth.h breaks + // LO vs WinAPI conflict + #undef WB_LEFT + #undef WB_RIGHT #include <winsock2.h> #include <ws2bth.h> #endif |