Kaydet (Commit) 2a5b8f34 authored tarafından Ashod Nakashian's avatar Ashod Nakashian Kaydeden (comit) Stephan Bergmann

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/22811Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarStephan Bergmann <sbergman@redhat.com>
üst 58a22dc0
......@@ -422,7 +422,7 @@ def filter_ignore(line, module):
]
if module == 'xmlsecurity':
ignore_list += [
'xmlsec/crypto.h',
'xmlsec/*',
'xmlsecurity/xmlsec-wrapper.h',
]
......
......@@ -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: */
......@@ -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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment