[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sd/source

[Luboš Luňák]

 sd/source/ui/remotecontrol/BluetoothServer.cxx |    8 ++++++++
 1 file changed, 8 insertions(+)

New commits:
commit ecfe412f7758c1ab3d3f2a784c7d0356585529e5
Author: Luboš Luňák <l.lu...@suse.cz>
Date:   Thu Feb 14 18:23:49 2013 +0100

    fix build
    
    Caused by 185e1be6cd1954b8cc5a302c879384f2549cd060,
    fix is more or less d0d07cd2975c1fb783d0f8591dd3a4931d1c5be5.
    
    Change-Id: Ia7d228139126b3e60370b85c106bc970f4e68cce
    
    Signed-off-by: Kohei Yoshida <kohei.yosh...@gmail.com>

diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx 
b/sd/source/ui/remotecontrol/BluetoothServer.cxx
index 9912614..0a5e1d0 100644
--- a/sd/source/ui/remotecontrol/BluetoothServer.cxx
+++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx
@@ -34,7 +34,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__

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits