diff options
| author | Tim Potter <tpot@samba.org> | 2002-12-04 23:57:15 +0000 |
|---|---|---|
| committer | Tim Potter <tpot@samba.org> | 2002-12-04 23:57:15 +0000 |
| commit | bb2aa240de7da9a3b6a6d9749eb5fccf84a891be (patch) | |
| tree | 0534470be57e927f48ea92f02736eebb6dab6647 /source3/include/debug.h | |
| parent | 8623ca6f82df2738f043bb4f344b050cd10281ed (diff) | |
| download | samba-bb2aa240de7da9a3b6a6d9749eb5fccf84a891be.tar.gz samba-bb2aa240de7da9a3b6a6d9749eb5fccf84a891be.tar.bz2 samba-bb2aa240de7da9a3b6a6d9749eb5fccf84a891be.zip | |
Remove FILE_MACRO as __FILE__ is ANSI C.
(This used to be commit 2a9d183cf6ae8333dc7d9d9445c17dce005c1d24)
Diffstat (limited to 'source3/include/debug.h')
| -rw-r--r-- | source3/include/debug.h | 13 |
1 files changed, 4 insertions, 9 deletions
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 ) \ |