mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ugly workaround for msvc+ccache problem with gbuild MSC define

Browse Source 
Change-Id: I06ab10df77e2b3598f7268173206429596a50217
This commit is contained in:
Luboš Luňák
2012-12-21 11:17:38 +01:00
parent b0654e6b9c
commit d0d07cd297
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sd/source/ui/remotecontrol/BluetoothServer.cxx
View File

@@ -32,9 +32,16 @@
// LO vs WinAPI conflict // LO vs WinAPI conflict
#undef WB_LEFT #undef WB_LEFT
#undef WB_RIGHT #undef WB_RIGHT
#undef MSC // Unset a legacy define, as otherwise ws2bth.h breaks
#include <winsock2.h> #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> #include <ws2bth.h>
#undef MSC
#define MSC
#endif #endif
#ifdef __MINGW32__ #ifdef __MINGW32__