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/smb_macros.h | |
| parent | 8623ca6f82df2738f043bb4f344b050cd10281ed (diff) | |
| download | samba-bb2aa240de7da9a3b6a6d9749eb5fccf84a891be.tar.gz samba-bb2aa240de7da9a3b6a6d9749eb5fccf84a891be.tar.xz samba-bb2aa240de7da9a3b6a6d9749eb5fccf84a891be.zip | |
Remove FILE_MACRO as __FILE__ is ANSI C.
(This used to be commit 2a9d183cf6ae8333dc7d9d9445c17dce005c1d24)
Diffstat (limited to 'source3/include/smb_macros.h')
| -rw-r--r-- | source3/include/smb_macros.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source3/include/smb_macros.h b/source3/include/smb_macros.h index 4926026061d..71d4bac7952 100644 --- a/source3/include/smb_macros.h +++ b/source3/include/smb_macros.h @@ -69,7 +69,7 @@ /* assert macros */ #define SMB_ASSERT(b) ((b)?(void)0: \ (DEBUG(0,("PANIC: assert failed at %s(%d)\n", \ - FILE_MACRO, __LINE__)), smb_panic("assert failed"))) + __FILE__, __LINE__)), smb_panic("assert failed"))) #define SMB_ASSERT_ARRAY(a,n) SMB_ASSERT((sizeof(a)/sizeof((a)[0])) >= (n)) /* these are useful macros for checking validity of handles */ @@ -156,17 +156,17 @@ #define HAS_CACHED_ERROR(fsp) ((fsp)->wbmpx_ptr && \ (fsp)->wbmpx_ptr->wr_discard) /* Macro to turn the cached error into an error packet */ -#define CACHED_ERROR(fsp) cached_error_packet(outbuf,fsp,__LINE__,FILE_MACRO) +#define CACHED_ERROR(fsp) cached_error_packet(outbuf,fsp,__LINE__,__FILE__) /* these are the datagram types */ #define DGRAM_DIRECT_UNIQUE 0x10 -#define ERROR_DOS(class,code) error_packet(outbuf,NT_STATUS_OK,class,code,__LINE__,FILE_MACRO) -#define ERROR_NT(status) error_packet(outbuf,status,0,0,__LINE__,FILE_MACRO) -#define ERROR_BOTH(status,class,code) error_packet(outbuf,status,class,code,__LINE__,FILE_MACRO) +#define ERROR_DOS(class,code) error_packet(outbuf,NT_STATUS_OK,class,code,__LINE__,__FILE__) +#define ERROR_NT(status) error_packet(outbuf,status,0,0,__LINE__,__FILE__) +#define ERROR_BOTH(status,class,code) error_packet(outbuf,status,class,code,__LINE__,__FILE__) /* this is how errors are generated */ -#define UNIXERROR(defclass,deferror) unix_error_packet(outbuf,defclass,deferror,__LINE__,FILE_MACRO) +#define UNIXERROR(defclass,deferror) unix_error_packet(outbuf,defclass,deferror,__LINE__,__FILE__) #define SMB_ROUNDUP(x,r) ( ((x)%(r)) ? ( (((x)+(r))/(r))*(r) ) : (x)) |