From 004860e1cc2b911939966b8841edf8e5223d6db3 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Mon, 16 Apr 2007 19:46:06 +0000
Subject: r22274: merge from samba4:

- provide __LINESTR__ macro
- add __STRINGSTRING() macro to really create a string of __LINE__
- fix __location__ macro

metze
(This used to be commit 5ca18546444e3e65491c2104cf8eeb1022bb5591)
---
 source3/lib/replace/replace.h | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'source3/lib/replace/replace.h')

diff --git a/source3/lib/replace/replace.h b/source3/lib/replace/replace.h
index 0d462b613d..840b448d24 100644
--- a/source3/lib/replace/replace.h
+++ b/source3/lib/replace/replace.h
@@ -439,8 +439,16 @@ typedef int bool;
 #define __STRING(x)    #x
 #endif
 
+#ifndef _STRINGSTRING
+#define __STRINGSTRING(x) __STRING(x)
+#endif
+
+#ifndef __LINESTR__
+#define __LINESTR__ __STRINGSTRING(__LINE__)
+#endif
+
 #ifndef __location__
-#define __location__ __FILE__ ":" __STRING(__LINE__)
+#define __location__ __FILE__ ":" __LINESTR__
 #endif
 
 #if MMAP_BLACKLIST
-- 
cgit