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 8e0e659c7d1ad2ea2eab817aa19e492984d18874..d63847556cc57d104cd29b46f7f69520adee47b5 100644 (file)
--- 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 a5455be2b68f758df478b77aad82a6eb33d9cdb2..0d462b613d15e5d5b9713ec1e0ac49660ad4bd18 100644 (file)
--- 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