bin/update_pch | 2 +- xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx | 6 +++++- xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx | 3 +-- 3 files changed, 7 insertions(+), 4 deletions(-)
New commits: commit 2a5b8f34eba2f560759f27bb415dc599e657ab28 Author: Ashod Nakashian <ashod.nakash...@collabora.co.uk> Date: Tue Mar 1 08:30:31 2016 -0500 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 <c...@libreoffice.org> Reviewed-by: Stephan Bergmann <sberg...@redhat.com> diff --git a/bin/update_pch b/bin/update_pch index d910ee1..3c6de78 100755 --- a/bin/update_pch +++ b/bin/update_pch @@ -422,7 +422,7 @@ def filter_ignore(line, module): ] if module == 'xmlsecurity': ignore_list += [ - 'xmlsec/crypto.h', + 'xmlsec/*', 'xmlsecurity/xmlsec-wrapper.h', ] diff --git a/xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx b/xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx index 615dc58..38e0e10 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 <basegfx/tuple/b2dtuple.hxx> #include <basegfx/tuple/b2ituple.hxx> #include <basegfx/tuple/b3dtuple.hxx> +#include <basegfx/vector/b2dsize.hxx> #include <basegfx/vector/b2dvector.hxx> #include <basegfx/vector/b2enums.hxx> #include <basegfx/vector/b2ivector.hxx> @@ -190,6 +191,8 @@ #include <com/sun/star/datatransfer/dnd/XDropTargetListener.hpp> #include <com/sun/star/drawing/LineCap.hpp> #include <com/sun/star/embed/Aspects.hpp> +#include <com/sun/star/embed/ElementModes.hpp> +#include <com/sun/star/embed/StorageFormats.hpp> #include <com/sun/star/frame/FeatureStateEvent.hpp> #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/frame/XTerminateListener.hpp> @@ -302,5 +305,6 @@ #include <unotools/readwritemutexguard.hxx> #include <unotools/syslocale.hxx> #include <unotools/unotoolsdllapi.h> +#include <xmlsecurity/sigstruct.hxx> /* 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 acdec5a..0a5a356 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 <uno/sequence2.h> #include <xmloff/dllapi.h> #include <xmlsecurity/biginteger.hxx> -#include <xmlsecurity/xmlsec-wrapper.h> // Cleanup windows header macro pollution. #if defined(_WIN32) && defined(WINAPI) _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits