[svn] GnuPG - r4153 - branches/GNUPG-1-9-BRANCH/tests

[svn author marcus]

Author: marcus
Date: 2006-06-08 14:17:38 +0200 (Thu, 08 Jun 2006)
New Revision: 4153

Modified:
   branches/GNUPG-1-9-BRANCH/tests/ChangeLog
   branches/GNUPG-1-9-BRANCH/tests/asschk.c
Log:
2006-06-08  Marcus Brinkmann  <marcus at g10code.de>

	* asschk.c (__func__) [__STDC_VERSION__ < 199901L && __GNUC__ >= 2]:
	Define macro to __FUNCTION__.
	(die): Use __func__ instead of __FUNCTION__.


Modified: branches/GNUPG-1-9-BRANCH/tests/ChangeLog
===================================================================
--- branches/GNUPG-1-9-BRANCH/tests/ChangeLog	2006-06-08 11:57:18 UTC (rev 4152)
+++ branches/GNUPG-1-9-BRANCH/tests/ChangeLog	2006-06-08 12:17:38 UTC (rev 4153)
@@ -1,3 +1,9 @@
+2006-06-08  Marcus Brinkmann  <marcus at g10code.de>
+
+	* asschk.c (__func__) [__STDC_VERSION__ < 199901L && __GNUC__ >= 2]:
+	Define macro to __FUNCTION__.
+	(die): Use __func__ instead of __FUNCTION__.
+
 2005-10-07  Marcus Brinkmann  <marcus at g10code.de>
 
 	* Makefile.am (TESTS_ENVIRONMENT): Remove LD_LIBRARY_PATH hack.

Modified: branches/GNUPG-1-9-BRANCH/tests/asschk.c
===================================================================
--- branches/GNUPG-1-9-BRANCH/tests/asschk.c	2006-06-08 11:57:18 UTC (rev 4152)
+++ branches/GNUPG-1-9-BRANCH/tests/asschk.c	2006-06-08 12:17:38 UTC (rev 4153)
@@ -116,6 +116,18 @@
 # define ATTR_PRINTF(f,a)
 #endif
 
+#if __STDC_VERSION__ < 199901L
+# if __GNUC__ >= 2
+#  define __func__ __FUNCTION__
+# else
+/* Let's try our luck here.  Some systems may provide __func__ without
+   providing __STDC_VERSION__ 199901L.  */
+#  if 0
+#   define __func__ "<unknown>"
+#  endif
+# endif
+#endif
+
 #define spacep(p) (*(p) == ' ' || *(p) == '\t')
 
 #define MAX_LINELEN 2048
@@ -188,7 +200,7 @@
   exit (1);
 }
 
-#define die(format, args...) (die) ("%s: " format, __FUNCTION__ , ##args)
+#define die(format, args...) (die) ("%s: " format, __func__ , ##args)
 
 static void
 err (const char *format, ...)