From 2a5b8f34eba2f560759f27bb415dc599e657ab28 Mon Sep 17 00:00:00 2001 From: Ashod Nakashian Date: Tue, 1 Mar 2016 08:30:31 -0500 Subject: Exclude xmlsec headers from precompiled headers Internal headers should not be exposed, rather xmlsec-wrapper.h should be used. Unfortunately, the latter causes undefined symbols on Linux when pch is enabled. Change-Id: Id68f1cde5090f1a8ba9530894e08edbeb3ad4165 Reviewed-on: https://gerrit.libreoffice.org/22811 Tested-by: Jenkins Reviewed-by: Stephan Bergmann --- xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx | 6 +++++- xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx | 3 +-- 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'xmlsecurity') diff --git a/xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx b/xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx index 615dc58d51a8..38e0e10aacac 100644 --- a/xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx +++ b/xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx @@ -13,7 +13,7 @@ manual changes will be rewritten by the next run of update_pch.sh (which presumably also fixes all possible problems, so it's usually better to use it). - Generated on 2016-02-06 12:32:41 using: + Generated on 2016-02-29 20:17:57 using: ./bin/update_pch xmlsecurity xmlsecurity --cutoff=6 --exclude:system --include:module --include:local If after updating build fails, use the following command to locate conflicting headers: @@ -172,6 +172,7 @@ #include #include #include +#include #include #include #include @@ -190,6 +191,8 @@ #include #include #include +#include +#include #include #include #include @@ -302,5 +305,6 @@ #include #include #include +#include /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx b/xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx index acdec5a0f319..0a5a35609af7 100644 --- a/xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx +++ b/xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx @@ -13,7 +13,7 @@ manual changes will be rewritten by the next run of update_pch.sh (which presumably also fixes all possible problems, so it's usually better to use it). - Generated on 2016-01-10 17:36:56 using: + Generated on 2016-03-01 08:26:50 using: ./bin/update_pch xmlsecurity xsec_xmlsec --cutoff=2 --exclude:system --include:module --include:local If after updating build fails, use the following command to locate conflicting headers: @@ -116,7 +116,6 @@ #include #include #include -#include // Cleanup windows header macro pollution. #if defined(_WIN32) && defined(WINAPI) -- cgit