summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2018-02-22 16:19:56 +0100
committerWerner Koch <wk@gnupg.org>2018-02-22 16:19:56 +0100
commit20539ea5cad1903352e01ef95aecdda4d5cd999b (patch)
tree609042662948bcd256dd4400b64bdb5e656173e4 /tests
parentbuild: Update autogen.sh to set a git PATCH prefix. (diff)
parentPost release updates. (diff)
downloadgnupg2-20539ea5cad1903352e01ef95aecdda4d5cd999b.tar.xz
gnupg2-20539ea5cad1903352e01ef95aecdda4d5cd999b.zip
Merge branch 'STABLE-BRANCH-2-2'
Diffstat (limited to 'tests')
-rw-r--r--tests/asschk.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/asschk.c b/tests/asschk.c
index 2595c0a99..65828e5b2 100644
--- a/tests/asschk.c
+++ b/tests/asschk.c
@@ -116,7 +116,7 @@
#endif
#if __STDC_VERSION__ < 199901L
-# if __GNUC__ >= 2
+# if __GNUC__ >= 2 && !defined (__func__)
# define __func__ __FUNCTION__
# else
/* Let's try our luck here. Some systems may provide __func__ without