Use __FUNCTION__, which works on gcc and MSVC 7/8, instead of

__func__, which while standardized works only with gcc.  I'll wait for
bug reports from VC6 before bothering with fallback code...

diff --git a/simgear/nasal/lib.c b/simgear/nasal/lib.c
index 70206c653143e6811082a10346eed9b5e99d256d..fd8451be7b264b9e8bce13e14be1782866c01bd6 100644 (file)
--- a/simgear/nasal/lib.c
+++ b/simgear/nasal/lib.c
@@ -16,9 +16,9 @@
 #define NEWCSTR(c, s) NEWSTR(c, s, strlen(s))
 
 // Generic argument error, assumes that the symbol "c" is a naContext,
-// and that the __func__ string is of the form "f_NASALSYMBOL".
+// and that the __FUNCTION__ string is of the form "f_NASALSYMBOL".
 #define ARGERR() \
-    naRuntimeError(c, "bad/missing argument to %s()", (__func__ + 2))
+    naRuntimeError(c, "bad/missing argument to %s()", (__FUNCTION__ + 2))
 
 static naRef f_size(naContext c, naRef me, int argc, naRef* args)
 {

diff --git a/simgear/nasal/mathlib.c b/simgear/nasal/mathlib.c
index 367aa2d2da846fb675b4aae4500da7a1f63edcae..639cce32cbc97a484248fe8f21fb60802489c787 100644 (file)
--- a/simgear/nasal/mathlib.c
+++ b/simgear/nasal/mathlib.c
@@ -5,7 +5,7 @@
 
 // Toss a runtime error for any NaN or Inf values produced.  Note that
 // this assumes an IEEE 754 format.
-#define VALIDATE(r) (valid(r.num) ? (r) : die(c, __func__+2))
+#define VALIDATE(r) (valid(r.num) ? (r) : die(c, __FUNCTION__+2))
 
 static int valid(double d)
 {