[Libreoffice-commits] core.git: sd/source
LuboÅ¡ LuÅák
l.lunak at suse.cz
Fri Feb 15 05:33:42 PST 2013
sd/source/ui/remotecontrol/BluetoothServer.cxx | 8 --------
1 file changed, 8 deletions(-)
New commits:
commit a04ab936088896789f5cf00583cd9767b5646f35
Author: LuboÅ¡ LuÅák <l.lunak at suse.cz>
Date: Fri Feb 15 14:32:27 2013 +0100
Revert "fix build", not needed in master
I meant to do this for 4-0, not for master, as the commits mentioned in the message
show, this is not needed in master.
This reverts commit b60ccd4d4ddf4076085890938bcc08aca2737e15.
diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx b/sd/source/ui/remotecontrol/BluetoothServer.cxx
index 7fa75ff..e877cca 100644
--- a/sd/source/ui/remotecontrol/BluetoothServer.cxx
+++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx
@@ -36,15 +36,7 @@
#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 MACOSX
More information about the Libreoffice-commits
mailing list