svn commit: samba r15280 - in branches/SAMBA_4_0/source: build/m4 lib/replace

[metze at samba.org]

Author: metze
Date: 2006-04-26 14:20:46 +0000 (Wed, 26 Apr 2006)
New Revision: 15280

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15280

Log:
- remove the 2nd check for __FUNCTION__
- fallback to __func__ if __FUNCTION__ isn't there

metze
Modified:
   branches/SAMBA_4_0/source/build/m4/check_cc.m4
   branches/SAMBA_4_0/source/lib/replace/config.m4
   branches/SAMBA_4_0/source/lib/replace/replace.h


Changeset:
Modified: branches/SAMBA_4_0/source/build/m4/check_cc.m4
===================================================================
--- branches/SAMBA_4_0/source/build/m4/check_cc.m4	2006-04-26 14:15:14 UTC (rev 15279)
+++ branches/SAMBA_4_0/source/build/m4/check_cc.m4	2006-04-26 14:20:46 UTC (rev 15280)
@@ -187,13 +187,6 @@
 
 AC_PATH_PROG(GCOV,gcov)
 
-AC_CACHE_CHECK([for __FUNCTION__ macro],samba_cv_HAVE_FUNCTION_MACRO,[
-AC_TRY_COMPILE([#include <stdio.h>], [printf("%s\n", __FUNCTION__);],
-samba_cv_HAVE_FUNCTION_MACRO=yes,samba_cv_HAVE_FUNCTION_MACRO=no)])
-if test x"$samba_cv_HAVE_FUNCTION_MACRO" = x"yes"; then
-    AC_DEFINE(HAVE_FUNCTION_MACRO,1,[Whether there is a __FUNCTION__ macro])
-fi
-
 AC_PATH_PROG(MAKE,make)
 
 AC_CACHE_CHECK([whether we have GNU make], samba_cv_gnu_make, [

Modified: branches/SAMBA_4_0/source/lib/replace/config.m4
===================================================================
--- branches/SAMBA_4_0/source/lib/replace/config.m4	2006-04-26 14:15:14 UTC (rev 15279)
+++ branches/SAMBA_4_0/source/lib/replace/config.m4	2006-04-26 14:20:46 UTC (rev 15280)
@@ -167,6 +167,14 @@
 samba_cv_HAVE_FUNCTION_MACRO=yes,samba_cv_HAVE_FUNCTION_MACRO=no)])
 if test x"$samba_cv_HAVE_FUNCTION_MACRO" = x"yes"; then
     AC_DEFINE(HAVE_FUNCTION_MACRO,1,[Whether there is a __FUNCTION__ macro])
+else
+    dnl __func__ macro
+    AC_CACHE_CHECK([for __func__ macro],samba_cv_HAVE_func_MACRO,[
+    AC_TRY_COMPILE([#include <stdio.h>], [printf("%s\n", __func__);],
+    samba_cv_HAVE_func_MACRO=yes,samba_cv_HAVE_func_MACRO=no)])
+    if test x"$samba_cv_HAVE_func_MACRO" = x"yes"; then
+       AC_DEFINE(HAVE_func_MACRO,1,[Whether there is a __func__ macro])
+    fi
 fi
 
 AC_CHECK_HEADERS([sys/param.h])

Modified: branches/SAMBA_4_0/source/lib/replace/replace.h
===================================================================
--- branches/SAMBA_4_0/source/lib/replace/replace.h	2006-04-26 14:15:14 UTC (rev 15279)
+++ branches/SAMBA_4_0/source/lib/replace/replace.h	2006-04-26 14:20:46 UTC (rev 15280)
@@ -212,8 +212,12 @@
 #endif
 
 #ifndef HAVE_FUNCTION_MACRO
+#ifdef HAVE_func_MACRO
+#define __FUNCTION__ __func__
+#else
 #define __FUNCTION__ ("")
 #endif
+#endif
 
 #ifdef HAVE_SYS_PARAM_H
 #include <sys/param.h>