[PATCH] fix build

Luboš Luňák (via_Code_Review) gerrit at gerrit.libreoffice.org
Thu Feb 14 09:25:59 PST 2013


Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/2154

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/54/2154/1

fix build

Caused by 185e1be6cd1954b8cc5a302c879384f2549cd060,
fix is more or less d0d07cd2975c1fb783d0f8591dd3a4931d1c5be5.

Change-Id: Ia7d228139126b3e60370b85c106bc970f4e68cce
---
M sd/source/ui/remotecontrol/BluetoothServer.cxx
1 file changed, 8 insertions(+), 0 deletions(-)



diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx b/sd/source/ui/remotecontrol/BluetoothServer.cxx
index f222628..2e0cf34 100644
--- a/sd/source/ui/remotecontrol/BluetoothServer.cxx
+++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx
@@ -33,7 +33,15 @@
   #undef WB_LEFT
   #undef WB_RIGHT
   #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__

-- 
To view, visit https://gerrit.libreoffice.org/2154
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia7d228139126b3e60370b85c106bc970f4e68cce
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Luboš Luňák <l.lunak at suse.cz>


More information about the LibreOffice mailing list