Ignore:
Timestamp:
Apr 25, 2007, 9:44:55 AM (14 years ago)
Author:
Paul Smedley
Message:

Code updated to Samba 3.0.25rc2 level

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/samba/source/lib/talloc/talloc.h

    r1 r30  
    3333  this uses a little trick to allow __LINE__ to be stringified
    3434*/
    35 #define _STRING_LINE_(s)    #s
    36 #define _STRING_LINE2_(s)   _STRING_LINE_(s)
    37 #define __LINESTR__       _STRING_LINE2_(__LINE__)
    38 #define __location__ __FILE__ ":" __LINESTR__
     35#ifndef __location__
     36#define __TALLOC_STRING_LINE1__(s)    #s
     37#define __TALLOC_STRING_LINE2__(s)   __TALLOC_STRING_LINE1__(s)
     38#define __TALLOC_STRING_LINE3__  __TALLOC_STRING_LINE2__(__LINE__)
     39#define __location__ __FILE__ ":" __TALLOC_STRING_LINE3__
     40#endif
    3941
    4042#ifndef TALLOC_DEPRECATED
Note: See TracChangeset for help on using the changeset viewer.