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

r22271: merge from samba4:

provide __location__ in replace.h

and see how the build-farm likes this simpler version

metze
---

diff --git a/source/lib/replace/README b/source/lib/replace/README
index 8e0e659c7d1..d63847556cc 100644
--- a/source/lib/replace/README
+++ b/source/lib/replace/README
@@ -77,6 +77,9 @@ CHAR_BIT
 Macros:
 va_copy
 __FUNCTION__
+__FILE__
+__LINE__
+__location__
 __STRING
 MIN
 MAX
diff --git a/source/lib/replace/replace.h b/source/lib/replace/replace.h
index a5455be2b68..0d462b613d1 100644
--- a/source/lib/replace/replace.h
+++ b/source/lib/replace/replace.h
@@ -439,6 +439,10 @@ typedef int bool;
 #define __STRING(x)    #x
 #endif
 
+#ifndef __location__
+#define __location__ __FILE__ ":" __STRING(__LINE__)
+#endif
+
 #if MMAP_BLACKLIST
 #undef HAVE_MMAP
 #endif