[Libreoffice-commits] .: dbaccess/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Wed Dec 26 10:20:52 PST 2012
dbaccess/source/ui/dlg/adodatalinks.cxx | 3 +++
1 file changed, 3 insertions(+)
New commits:
commit a6077f6d7e79c4aeba59c749da21319fe0256d57
Author: Lubos Lunak <l.lunak at suse.cz>
Date: Wed Dec 26 19:20:24 2012 +0100
fix windows PCH build
diff --git a/dbaccess/source/ui/dlg/adodatalinks.cxx b/dbaccess/source/ui/dlg/adodatalinks.cxx
index bbc2964..f56b2cd 100644
--- a/dbaccess/source/ui/dlg/adodatalinks.cxx
+++ b/dbaccess/source/ui/dlg/adodatalinks.cxx
@@ -24,6 +24,9 @@
#pragma warning(push, 1)
#pragma warning(disable: 4917)
#endif
+// LO/windows.h conflict
+#undef WB_LEFT
+#undef WB_RIGHT
#include "msdasc.h" // OLE DB Service Component header
#if defined _MSC_VER
#pragma warning(push, 1)
More information about the Libreoffice-commits
mailing list