[Libreoffice-commits] core.git: external/libgpg-error

[Stephan Bergmann]

 external/libgpg-error/UnpackedTarball_libgpg-error.mk |    1 +
 external/libgpg-error/clang-cl.patch                  |   11 +++++++++++
 2 files changed, 12 insertions(+)

New commits:
commit a0d4ebae69b700ec51964f7ad6a831761170f13d
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Sun Dec 10 23:08:13 2017 +0100

    -Werror,-Wundef (clang-cl)
    
    Change-Id: Ie63408ddd3216b9012530f65f93c98cf04f0deca
    Reviewed-on: https://gerrit.libreoffice.org/46197
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/external/libgpg-error/UnpackedTarball_libgpg-error.mk b/external/libgpg-error/UnpackedTarball_libgpg-error.mk
index dadef68689d7..cdf656e13554 100644
--- a/external/libgpg-error/UnpackedTarball_libgpg-error.mk
+++ b/external/libgpg-error/UnpackedTarball_libgpg-error.mk
@@ -20,6 +20,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,libgpg-error, \
 	$(if $(filter MSC,$(COM)),external/libgpg-error/w32-build-fixes-3.patch.1) \
 	$(if $(filter MSC,$(COM)),external/libgpg-error/w32-disable-dllinit.patch.1) \
 	external/libgpg-error/w32-build-fixes-4.patch \
+	external/libgpg-error/clang-cl.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libgpg-error/clang-cl.patch b/external/libgpg-error/clang-cl.patch
new file mode 100755
index 000000000000..d98a948bdf59
--- /dev/null
+++ b/external/libgpg-error/clang-cl.patch
@@ -0,0 +1,11 @@
+--- src/gpg-error.h.in
++++ src/gpg-error.h.in
+@@ -141,7 +141,7 @@
+ 
+ 
+ /* GCC feature test.  */
+-#if __GNUC__
++#if defined __GNUC__
+ # define _GPG_ERR_GCC_VERSION (__GNUC__ * 10000 \
+                                + __GNUC_MINOR__ * 100 \
+                                + __GNUC_PATCHLEVEL__)