diff options
| author | Stefan Metzmacher <metze@samba.org> | 2006-04-26 14:20:46 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:05:01 -0500 |
| commit | 81d3f8e8a1fe075b99c51fee895da94536f4c972 (patch) | |
| tree | 71270713b8471f9793a875e176ba7dff4abc2dd8 /source4 | |
| parent | 6e847ca070aa1b15eb24966f8b9803e1982f2a83 (diff) | |
| download | samba-81d3f8e8a1fe075b99c51fee895da94536f4c972.tar.gz samba-81d3f8e8a1fe075b99c51fee895da94536f4c972.tar.bz2 samba-81d3f8e8a1fe075b99c51fee895da94536f4c972.zip | |
r15280: - remove the 2nd check for __FUNCTION__
- fallback to __func__ if __FUNCTION__ isn't there
metze
(This used to be commit 6c5a2b08ca2f0db6b39808740a06ed165e8b9ade)
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/build/m4/check_cc.m4 | 7 | ||||
| -rw-r--r-- | source4/lib/replace/config.m4 | 8 | ||||
| -rw-r--r-- | source4/lib/replace/replace.h | 4 |
3 files changed, 12 insertions, 7 deletions
diff --git a/source4/build/m4/check_cc.m4 b/source4/build/m4/check_cc.m4 index 64f44cd6ff..f5b6fa0995 100644 --- a/source4/build/m4/check_cc.m4 +++ b/source4/build/m4/check_cc.m4 @@ -187,13 +187,6 @@ AC_SUBST(HOSTCC) 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, [ diff --git a/source4/lib/replace/config.m4 b/source4/lib/replace/config.m4 index bac38f6439..bf46bdcc58 100644 --- a/source4/lib/replace/config.m4 +++ b/source4/lib/replace/config.m4 @@ -167,6 +167,14 @@ 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]) +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]) diff --git a/source4/lib/replace/replace.h b/source4/lib/replace/replace.h index 77f42acc97..d0575f4b60 100644 --- a/source4/lib/replace/replace.h +++ b/source4/lib/replace/replace.h @@ -212,8 +212,12 @@ typedef int bool; #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> |