diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2017-11-27 15:15:30 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2017-11-27 23:05:56 +0100 |
| commit | 68cf1dc0fc7af806dcff87a0bd6193bb090446b9 (patch) | |
| tree | 58b966d6849ea5deeff9116efe71e502025956c1 /xmlsecurity | |
| parent | 7d97827e5bfd080f884d900c4018d0d826316ce5 (diff) | |
Silence clang-cl -Werror,-Wundef in workdir/UnpackedTarball/gpgmepp/ includes
> workdir/UnpackedTarball/libgpg-error/src\gpg-error.h(709,5): error: '__GNUC__' is not defined, evaluates to 0 [-Werror,-Wundef]
> #if __GNUC__
> ^
> 1 error generated.
Change-Id: Icae46745069431e60faa7d2e6ca44ab800e72b95
Reviewed-on: https://gerrit.libreoffice.org/45341
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'xmlsecurity')
| -rw-r--r-- | xmlsecurity/source/gpg/CertificateImpl.hxx | 7 | ||||
| -rw-r--r-- | xmlsecurity/source/gpg/SecurityEnvironment.hxx | 7 | ||||
| -rw-r--r-- | xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx | 7 |
3 files changed, 21 insertions, 0 deletions
diff --git a/xmlsecurity/source/gpg/CertificateImpl.hxx b/xmlsecurity/source/gpg/CertificateImpl.hxx index 63cddc6dc7b9..938b76bc74a1 100644 --- a/xmlsecurity/source/gpg/CertificateImpl.hxx +++ b/xmlsecurity/source/gpg/CertificateImpl.hxx @@ -26,7 +26,14 @@ #include <com/sun/star/security/CertificateKind.hpp> #include <com/sun/star/security/XCertificate.hpp> +#if defined _MSC_VER && defined __clang__ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wundef" +#endif #include <key.h> +#if defined _MSC_VER && defined __clang__ +#pragma clang diagnostic pop +#endif class CertificateImpl : public cppu::WeakImplHelper< css::security::XCertificate, css::lang::XUnoTunnel >, diff --git a/xmlsecurity/source/gpg/SecurityEnvironment.hxx b/xmlsecurity/source/gpg/SecurityEnvironment.hxx index fda9d706c6a6..00480824b72a 100644 --- a/xmlsecurity/source/gpg/SecurityEnvironment.hxx +++ b/xmlsecurity/source/gpg/SecurityEnvironment.hxx @@ -24,7 +24,14 @@ #include <com/sun/star/security/CertificateValidity.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp> +#if defined _MSC_VER && defined __clang__ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wundef" +#endif #include <gpgme.h> +#if defined _MSC_VER && defined __clang__ +#pragma clang diagnostic pop +#endif #include <context.h> class SecurityEnvironmentGpg : public cppu::WeakImplHelper< css::xml::crypto::XSecurityEnvironment, diff --git a/xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx b/xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx index 795ae85e35a4..40ff550aea9b 100644 --- a/xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx +++ b/xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx @@ -22,7 +22,14 @@ #include <cppuhelper/supportsservice.hxx> #include <gpg/xmlsignature_gpgimpl.hxx> +#if defined _MSC_VER && defined __clang__ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wundef" +#endif #include <gpgme.h> +#if defined _MSC_VER && defined __clang__ +#pragma clang diagnostic pop +#endif #include <context.h> #include <key.h> #include <data.h> |