diff options
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/acconfig.h | 1 | ||||
| -rw-r--r-- | source3/configure.in | 7 | ||||
| -rw-r--r-- | source3/include/config.h.in | 6 | ||||
| -rw-r--r-- | source3/include/debug.h | 13 | ||||
| -rw-r--r-- | source3/smbd/build_options.c | 3 |
5 files changed, 5 insertions, 25 deletions
diff --git a/source3/acconfig.h b/source3/acconfig.h index 7b05525571..97b1e85924 100644 --- a/source3/acconfig.h +++ b/source3/acconfig.h @@ -69,7 +69,6 @@ #undef HAVE_BROKEN_GETGROUPS #undef REPLACE_GETPASS #undef REPLACE_INET_NTOA -#undef HAVE_FILE_MACRO #undef HAVE_FUNCTION_MACRO #undef HAVE_VA_COPY #undef HAVE_SETRESUID_DECL diff --git a/source3/configure.in b/source3/configure.in index 5b1529132f..d9f3ffe9cb 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -1188,13 +1188,6 @@ if test x"$samba_cv_SEEKDIR_RETURNS_VOID" = x"yes"; then AC_DEFINE(SEEKDIR_RETURNS_VOID,1,[Whether seekdir returns void]) fi -AC_CACHE_CHECK([for __FILE__ macro],samba_cv_HAVE_FILE_MACRO,[ -AC_TRY_COMPILE([#include <stdio.h>], [printf("%s\n", __FILE__);], -samba_cv_HAVE_FILE_MACRO=yes,samba_cv_HAVE_FILE_MACRO=no)]) -if test x"$samba_cv_HAVE_FILE_MACRO" = x"yes"; then - AC_DEFINE(HAVE_FILE_MACRO,1,[Whether there is a __FILE__ macro]) -fi - 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)]) diff --git a/source3/include/config.h.in b/source3/include/config.h.in index 5a6bcb21d5..62467d3acf 100644 --- a/source3/include/config.h.in +++ b/source3/include/config.h.in @@ -1,4 +1,4 @@ -/* include/config.h.in. Generated automatically from configure.in by autoheader. */ +/* include/config.h.in. Generated automatically from configure.in by autoheader 2.13. */ /* Define if type char is unsigned and you are not using gcc. */ #ifndef __CHAR_UNSIGNED__ @@ -125,7 +125,6 @@ #undef HAVE_BROKEN_GETGROUPS #undef REPLACE_GETPASS #undef REPLACE_INET_NTOA -#undef HAVE_FILE_MACRO #undef HAVE_FUNCTION_MACRO #undef HAVE_VA_COPY #undef HAVE_SETRESUID_DECL @@ -1431,9 +1430,6 @@ /* Whether seekdir returns void */ #undef SEEKDIR_RETURNS_VOID -/* Whether there is a __FILE__ macro */ -#undef HAVE_FILE_MACRO - /* Whether there is a __FUNCTION__ macro */ #undef HAVE_FUNCTION_MACRO diff --git a/source3/include/debug.h b/source3/include/debug.h index 5f87bf06fd..d4f45539f4 100644 --- a/source3/include/debug.h +++ b/source3/include/debug.h @@ -44,11 +44,6 @@ extern XFILE *dbf; extern pstring debugf; /* If we have these macros, we can add additional info to the header. */ -#ifdef HAVE_FILE_MACRO -#define FILE_MACRO (__FILE__) -#else -#define FILE_MACRO ("") -#endif #ifdef HAVE_FUNCTION_MACRO #define FUNCTION_MACRO (__FUNCTION__) @@ -157,7 +152,7 @@ extern BOOL *DEBUGLEVEL_CLASS_ISSET; ((DEBUGLEVEL_CLASS[ DBGC_CLASS ] >= (level))|| \ (!DEBUGLEVEL_CLASS_ISSET[ DBGC_CLASS ] && \ DEBUGLEVEL_CLASS[ DBGC_ALL ] >= (level)) ) \ - && dbghdr( level, FILE_MACRO, FUNCTION_MACRO, (__LINE__) ) ) + && dbghdr( level, __FILE__, FUNCTION_MACRO, (__LINE__) ) ) #define DEBUGLVLC( dbgc_class, level ) \ @@ -165,7 +160,7 @@ extern BOOL *DEBUGLEVEL_CLASS_ISSET; ((DEBUGLEVEL_CLASS[ dbgc_class ] >= (level))|| \ (!DEBUGLEVEL_CLASS_ISSET[ dbgc_class ] && \ DEBUGLEVEL_CLASS[ DBGC_ALL ] >= (level)) ) \ - && dbghdr( level, FILE_MACRO, FUNCTION_MACRO, (__LINE__) ) ) + && dbghdr( level, __FILE__, FUNCTION_MACRO, (__LINE__) ) ) #define DEBUG( level, body ) \ @@ -173,7 +168,7 @@ extern BOOL *DEBUGLEVEL_CLASS_ISSET; ((DEBUGLEVEL_CLASS[ DBGC_CLASS ] >= (level))|| \ (!DEBUGLEVEL_CLASS_ISSET[ DBGC_CLASS ] && \ DEBUGLEVEL_CLASS[ DBGC_ALL ] >= (level)) ) \ - && (dbghdr( level, FILE_MACRO, FUNCTION_MACRO, (__LINE__) )) \ + && (dbghdr( level, __FILE__, FUNCTION_MACRO, (__LINE__) )) \ && (dbgtext body) ) #define DEBUGC( dbgc_class, level, body ) \ @@ -181,7 +176,7 @@ extern BOOL *DEBUGLEVEL_CLASS_ISSET; ((DEBUGLEVEL_CLASS[ dbgc_class ] >= (level))|| \ (!DEBUGLEVEL_CLASS_ISSET[ dbgc_class ] && \ DEBUGLEVEL_CLASS[ DBGC_ALL ] >= (level)) ) \ - && (dbghdr( level, FILE_MACRO, FUNCTION_MACRO, (__LINE__) )) \ + && (dbghdr( level, __FILE__, FUNCTION_MACRO, (__LINE__) )) \ && (dbgtext body) ) #define DEBUGADD( level, body ) \ diff --git a/source3/smbd/build_options.c b/source3/smbd/build_options.c index 8129f22898..085f287446 100644 --- a/source3/smbd/build_options.c +++ b/source3/smbd/build_options.c @@ -294,9 +294,6 @@ void build_options(BOOL screen) #ifdef SEEKDIR_RETURNS_VOID output(screen," SEEKDIR_RETURNS_VOID\n"); #endif -#ifdef HAVE_FILE_MACRO - output(screen," HAVE_FILE_MACRO\n"); -#endif #ifdef HAVE_FUNCTION_MACRO output(screen," HAVE_FUNCTION_MACRO\n"); #endif |