[Libreoffice-commits] core.git: Branch 'distro/mimo/mimo-5-4-7-2' - l10ntools/source

[Michael Stahl (via logerrit)]

 l10ntools/source/uimerge.cxx |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit f95986bf8f1641f1bdd6235fc60c8ab411a56ed9
Author:     Michael Stahl <Michael.Stahl at cib.de>
AuthorDate: Mon Nov 25 18:16:48 2019 +0100
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Tue May 11 09:11:00 2021 +0200

    l10ntools: try to fix WNT build failure in uimerge.cxx by ...
    
    ... moving libxslt includes first:
    
    C:\PROGRA~2\MICROS~2\Windows\v7.1A\include\winnt.h(519): warning C4005: 'DECLARE_HANDLE': macro redefinition
    C:\LO\lode\dev\core\include\sal/main.h(87): note: see previous definition of 'DECLARE_HANDLE'
    C:\PROGRA~2\MICROS~2\Windows\v7.1A\include\windef.h(280): error C2371: 'HINSTANCE': redefinition; different basic types
    C:\LO\lode\dev\core\include\sal/main.h(89): note: see declaration of 'HINSTANCE'
    
    Change-Id: Ia9a89835c2d0b0c3dadde6258b5f3ea013541626

diff --git a/l10ntools/source/uimerge.cxx b/l10ntools/source/uimerge.cxx
index dd334de13fa5..b85ac7c78915 100644
--- a/l10ntools/source/uimerge.cxx
+++ b/l10ntools/source/uimerge.cxx
@@ -7,17 +7,17 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include <libexslt/exslt.h>
+#include <libxslt/transform.h>
+#include <libxslt/xslt.h>
+#include <libxslt/xsltutils.h>
+
 #include <sal/main.h>
 
 #include <osl/file.hxx>
 
 #include <rtl/strbuf.hxx>
 
-#include <libexslt/exslt.h>
-#include <libxslt/transform.h>
-#include <libxslt/xslt.h>
-#include <libxslt/xsltutils.h>
-
 #include <stdio.h>
 
 #include "common.hxx"