From: Stefan Metzmacher <metze@samba.org>
Date: Mon, 16 Apr 2007 19:15:57 +0000 (+0000)
Subject: r22268: merge from samba4:
X-Git-Tag: samba-misc-tags/initial-v3-0-unstable~700
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4c93c05542c5a238b1b7a5cd9b75f9f852c0ad4d;p=thirdparty%2Fsamba.git

r22268: merge from samba4:

protect #define __location__ with an #ifndef

metze
---

diff --git a/source/lib/talloc/talloc.h b/source/lib/talloc/talloc.h
index 75c130a2756..51640bb28d5 100644
--- a/source/lib/talloc/talloc.h
+++ b/source/lib/talloc/talloc.h
@@ -32,10 +32,12 @@ typedef void TALLOC_CTX;
 /*
   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