diff options
| author | Luboš Luňák <l.lunak@suse.cz> | 2012-12-21 11:17:38 +0100 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2012-12-21 11:18:22 +0100 |
| commit | d0d07cd2975c1fb783d0f8591dd3a4931d1c5be5 (patch) | |
| tree | 76f814f9320508a356ae75ee1c323f75ce398f42 /sd | |
| parent | Another fix for my UNO changes (diff) | |
| download | core-d0d07cd2975c1fb783d0f8591dd3a4931d1c5be5.tar.gz core-d0d07cd2975c1fb783d0f8591dd3a4931d1c5be5.zip | |
ugly workaround for msvc+ccache problem with gbuild MSC define
Change-Id: I06ab10df77e2b3598f7268173206429596a50217
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/remotecontrol/BluetoothServer.cxx | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx b/sd/source/ui/remotecontrol/BluetoothServer.cxx index 22ca95b56948..16b1b1556087 100644 --- a/sd/source/ui/remotecontrol/BluetoothServer.cxx +++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx @@ -32,9 +32,16 @@ // LO vs WinAPI conflict #undef WB_LEFT #undef WB_RIGHT - #undef MSC // Unset a legacy define, as otherwise ws2bth.h breaks #include <winsock2.h> + // HACK: ws2bth.h defines a struct with a field named MSC, which is + // a #define set by gbuild. Plain #undef MSC here fails with MSVC + // used together with ccache (bug, presumably), so #define it to some + // other usable value. + #undef MSC + #define MSC mscfield #include <ws2bth.h> + #undef MSC + #define MSC #endif #ifdef __MINGW32__ |