[Libreoffice-commits] .: l10ntools/Executable_transex3.mk l10ntools/inc l10ntools/prj

[Libreoffice Gerrit user]

 l10ntools/Executable_transex3.mk |    1 +
 l10ntools/inc/xmlparse.hxx       |    3 +++
 l10ntools/prj/build.lst          |    2 +-
 3 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 7753bbb8b160251525ac2f661ccb60f9fc98da50
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Nov 20 16:19:12 2012 +0100

    Fix libxml2 usage in l10ntools
    
    Change-Id: I746af9162d5cd01e0ce0a9f469f0771d7934ba2d

diff --git a/l10ntools/Executable_transex3.mk b/l10ntools/Executable_transex3.mk
index d2b7952..5568f93 100644
--- a/l10ntools/Executable_transex3.mk
+++ b/l10ntools/Executable_transex3.mk
@@ -52,6 +52,7 @@ $(eval $(call gb_Executable_add_exception_objects,transex3,\
 $(eval $(call gb_Executable_use_externals,transex3,\
     icuuc \
     $(if $(filter MSC,$(COM)),icuin,icui18n) \
+    libxml2 \
 ))
 
 # vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/l10ntools/inc/xmlparse.hxx b/l10ntools/inc/xmlparse.hxx
index 0fedb2b..7a75872 100644
--- a/l10ntools/inc/xmlparse.hxx
+++ b/l10ntools/inc/xmlparse.hxx
@@ -26,7 +26,10 @@
 #include <vector>
 
 #include <signal.h>
+
+#include <libxml/xmlexports.h> // define XMLCALL so expat.h does not redefine it
 #include <expat.h>
+
 #include <rtl/ustring.hxx>
 #include <rtl/ustrbuf.hxx>
 #include "boost/unordered_map.hpp"
diff --git a/l10ntools/prj/build.lst b/l10ntools/prj/build.lst
index af0fdfe..ebe9ce1 100644
--- a/l10ntools/prj/build.lst
+++ b/l10ntools/prj/build.lst
@@ -1,3 +1,3 @@
-tr l10ntools : EXPAT:expat LIBXSLT:libxslt ICU:icu sal NULL
+tr l10ntools : EXPAT:expat LIBXML2:libxml2 LIBXSLT:libxslt ICU:icu sal NULL
 tr	l10ntools					usr1	-	all	tr_mkout NULL
 tr	l10ntools\prj					nmake	-	all	tr_prj NULL