sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

Merge from HEAD:

Browse Source 
>Remove FILE_MACRO as __FILE__ is ANSI C.
(This used to be commit 21eb4b5a2d)
This commit is contained in:
Tim Potter 2002-12-05 23:30:49 +00:00
parent f7f3d42acf
commit 2c5e33b7f2
5 changed files with 5 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source3/acconfig.h
View File

@ -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

7
source3/configure.in
View File

@ -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)])

6
source3/include/config.h.in
View File

@ -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

13
source3/include/debug.h
View File

@ -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 ) \

3
source3/smbd/build_options.c
View File

@ -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