diff --git a/ChangeLog b/ChangeLog
index 7b209f1a0..1930fbdcf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-16  Bruno Haible  <bruno@clisp.org>
+
+	* lightning/asm-common.h: Don't use __func__ nor __FUNCTION__ if
+	not compiling with GNU C.
+
 2006-02-16  Paolo Bonzini  <bonzini@gnu.org>
 
 	* lightning/ppc/core.h: Fix jit_ldxi_* with big displacement.
diff --git a/lightning/asm-common.h b/lightning/asm-common.h
index f902de443..6f61521e2 100644
--- a/lightning/asm-common.h
+++ b/lightning/asm-common.h
@@ -37,17 +37,21 @@
 #ifndef _ASM_SAFETY
 #define JITFAIL(MSG) 0
 #else
-#if defined __GNUC__ && (__GNUC__ == 3 ? __GNUC_MINOR__ >= 2 : __GNUC__ > 3)
+#if (defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L) || (defined __GNUC__ && (__GNUC__ == 3 ? __GNUC_MINOR__ >= 2 : __GNUC__ > 3))
 #define JITFAIL(MSG) jit_fail(MSG, __FILE__, __LINE__, __func__)
-#else
+#elif defined __GNUC__
 #define JITFAIL(MSG) jit_fail(MSG, __FILE__, __LINE__, __FUNCTION__)
+#else
+#define JITFAIL(MSG) jit_fail(MSG, __FILE__, __LINE__, "(unknown)")
 #endif
 #endif
 
-#if defined __GNUC__ && (__GNUC__ == 3 ? __GNUC_MINOR__ >= 2 : __GNUC__ > 3)
+#if (defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L) || (defined __GNUC__ && (__GNUC__ == 3 ? __GNUC_MINOR__ >= 2 : __GNUC__ > 3))
 #define JITSORRY(MSG) jit_fail("sorry, unimplemented: " MSG, __FILE__, __LINE__, __func__)
-#else
+#elif defined __GNUC__
 #define JITSORRY(MSG) jit_fail("sorry, unimplemented: " MSG, __FILE__, __LINE__, __FUNCTION__)
+#else
+#define JITSORRY(MSG) jit_fail("sorry, unimplemented: " MSG, __FILE__, __LINE__, "(unknown)")
 #endif
 
 #ifdef __GNUC__