svn commit: samba r22269 - in branches/SAMBA_3_0_25/source/lib/talloc: .

Author: metze
Date: 2007-04-16 19:16:20 +0000 (Mon, 16 Apr 2007)
New Revision: 22269

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=22269

Log:
merge from samba4:

protect #define __location__ with an #ifndef

metze
Modified:
   branches/SAMBA_3_0_25/source/lib/talloc/talloc.h


Changeset:
Modified: branches/SAMBA_3_0_25/source/lib/talloc/talloc.h
===================================================================
--- branches/SAMBA_3_0_25/source/lib/talloc/talloc.h    2007-04-16 19:15:57 UTC 
(rev 22268)
+++ branches/SAMBA_3_0_25/source/lib/talloc/talloc.h    2007-04-16 19:16:20 UTC 
(rev 22269)
@@ -32,10 +32,12 @@
 /*
   this uses a little trick to allow __LINE__ to be stringified
 */
-#define _STRING_LINE_(s)    #s
-#define _STRING_LINE2_(s)   _STRING_LINE_(s)
-#define __LINESTR__       _STRING_LINE2_(__LINE__)
-#define __location__ __FILE__ ":" __LINESTR__
+#ifndef __location__
+#define __TALLOC_STRING_LINE1__(s)    #s
+#define __TALLOC_STRING_LINE2__(s)   __TALLOC_STRING_LINE1__(s)
+#define __TALLOC_STRING_LINE3__  __TALLOC_STRING_LINE2__(__LINE__)
+#define __location__ __FILE__ ":" __TALLOC_STRING_LINE3__
+#endif
 
 #ifndef TALLOC_DEPRECATED
 #define TALLOC_DEPRECATED 0