diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2019-11-25 18:16:48 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2021-05-11 09:11:00 +0200 |
| commit | f95986bf8f1641f1bdd6235fc60c8ab411a56ed9 (patch) | |
| tree | 4bbef448966160c541eb6a061c30a393ccc44b4d /l10ntools/source/uimerge.cxx | |
| parent | 12f2ddf58c4b4b7ce35814be09a8f0b99bde18fb (diff) | |
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
Diffstat (limited to 'l10ntools/source/uimerge.cxx')
| -rw-r--r-- | l10ntools/source/uimerge.cxx | 10 |
1 files 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 <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" |