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@suse.cz>
Context
- [PATCH] fix build · via Code Review
Privacy Policy |
Impressum (Legal Info) |
Copyright information: Unless otherwise specified, all text and images
on this website are licensed under the
Creative Commons Attribution-Share Alike 3.0 License.
This does not include the source code of LibreOffice, which is
licensed under the Mozilla Public License (
MPLv2).
"LibreOffice" and "The Document Foundation" are
registered trademarks of their corresponding registered owners or are
in actual use as trademarks in one or more countries. Their respective
logos and icons are also subject to international copyright laws. Use
thereof is explained in our
trademark policy.