From 4baa7d9c4102bde555a32d13a84521cb95326c51 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Mon, 25 Nov 2019 18:16:48 +0100 Subject: 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 --- l10ntools/source/uimerge.cxx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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 +#include +#include +#include + #include #include #include -#include -#include -#include -#include - #include #include "common.hxx" -- cgit