diff options
| author | Tim Potter <tpot@samba.org> | 2002-12-05 23:30:49 +0000 |
|---|---|---|
| committer | Tim Potter <tpot@samba.org> | 2002-12-05 23:30:49 +0000 |
| commit | 2c5e33b7f2e372b348c4aa97824078f7b62db8ff (patch) | |
| tree | ca5a1ac1383f006918951035d555a14c66b47c98 /source3/include | |
| parent | f7f3d42acf00b0b4b99f37cbd320c9c2aed6858e (diff) | |
| download | samba-2c5e33b7f2e372b348c4aa97824078f7b62db8ff.tar.gz samba-2c5e33b7f2e372b348c4aa97824078f7b62db8ff.tar.bz2 samba-2c5e33b7f2e372b348c4aa97824078f7b62db8ff.zip | |
Merge from HEAD:
>Remove FILE_MACRO as __FILE__ is ANSI C.
(This used to be commit 21eb4b5a2dd2f9a6a0d3cd94408bb52359d2e926)
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/config.h.in | 6 | ||||
| -rw-r--r-- | source3/include/debug.h | 13 |
2 files changed, 5 insertions, 14 deletions
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 ) \ |