[Libreoffice-commits] .: l10ntools/source

Fridrich Strba fridrich at kemper.freedesktop.org
Fri Mar 25 16:41:36 PDT 2011


 l10ntools/source/directory.cxx |    5 +++++
 l10ntools/source/helpmerge.cxx |    2 ++
 2 files changed, 7 insertions(+)

New commits:
commit 902876bbbc58992c78b19a9f427d1dd490f86b72
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Sat Mar 26 00:41:28 2011 +0100

    One more windows breakage gone

diff --git a/l10ntools/source/directory.cxx b/l10ntools/source/directory.cxx
index 6a6a76e..3dc20d9 100644
--- a/l10ntools/source/directory.cxx
+++ b/l10ntools/source/directory.cxx
@@ -29,6 +29,11 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_l10ntools.hxx"
+
+#ifdef WNT
+#include <windows.h>
+#endif
+
 #include <l10ntools/directory.hxx>
 #include "tools/string.hxx"
 #include <iostream>
diff --git a/l10ntools/source/helpmerge.cxx b/l10ntools/source/helpmerge.cxx
index 39e718c..b75f875 100644
--- a/l10ntools/source/helpmerge.cxx
+++ b/l10ntools/source/helpmerge.cxx
@@ -43,6 +43,8 @@
 #include <vector>
 #include "rtl/strbuf.hxx"
 #ifdef WNT
+#include <windows.h>
+#undef CopyFile
 #include <direct.h>
 #endif
 


More information about the Libreoffice-commits mailing list