summaryrefslogtreecommitdiffstats
path: root/source/lib
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2007-04-16 19:23:00 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:19:23 -0500
commit3f87165771ecbbcd70e870235e324d25b21a04d4 (patch)
tree6f413e3834606cbef9d53727a672dacc03261340 /source/lib
parent4c93c05542c5a238b1b7a5cd9b75f9f852c0ad4d (diff)
downloadsamba-3f87165771ecbbcd70e870235e324d25b21a04d4.tar.gz
samba-3f87165771ecbbcd70e870235e324d25b21a04d4.tar.xz
samba-3f87165771ecbbcd70e870235e324d25b21a04d4.zip
r22271: merge from samba4:
provide __location__ in replace.h and see how the build-farm likes this simpler version metze
Diffstat (limited to 'source/lib')
-rw-r--r--source/lib/replace/README3
-rw-r--r--source/lib/replace/replace.h4
2 files changed, 7 insertions, 0 deletions
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