summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2007-04-16 19:46:06 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:19:23 -0500
commit004860e1cc2b911939966b8841edf8e5223d6db3 (patch)
treec953c016c5fbbe4bcf0b9ce7032e0e9b9f660100
parent48e29ff642282a6c240114d8d6285548f81098a6 (diff)
downloadsamba-004860e1cc2b911939966b8841edf8e5223d6db3.tar.gz
samba-004860e1cc2b911939966b8841edf8e5223d6db3.tar.bz2
samba-004860e1cc2b911939966b8841edf8e5223d6db3.zip
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)
-rw-r--r--source3/lib/replace/README2
-rw-r--r--source3/lib/replace/replace.h10
2 files changed, 11 insertions, 1 deletions
diff --git a/source3/lib/replace/README b/source3/lib/replace/README
index d63847556c..c2de560314 100644
--- a/source3/lib/replace/README
+++ b/source3/lib/replace/README
@@ -79,8 +79,10 @@ va_copy
__FUNCTION__
__FILE__
__LINE__
+__LINESTR__
__location__
__STRING
+__STRINGSTRING
MIN
MAX
QSORT_CAST
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