diff options
| author | Stefan Metzmacher <metze@samba.org> | 2007-04-16 19:23:00 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:19:23 -0500 |
| commit | 48e29ff642282a6c240114d8d6285548f81098a6 (patch) | |
| tree | 26396cb924bc8544b6e7c2059fbd25ef5fc9642e /source3 | |
| parent | d917f708e10515e8260ec54ac17ca5e8d7ad1e3a (diff) | |
| download | samba-48e29ff642282a6c240114d8d6285548f81098a6.tar.gz samba-48e29ff642282a6c240114d8d6285548f81098a6.tar.bz2 samba-48e29ff642282a6c240114d8d6285548f81098a6.zip | |
r22271: merge from samba4:
provide __location__ in replace.h
and see how the build-farm likes this simpler version
metze
(This used to be commit 3f87165771ecbbcd70e870235e324d25b21a04d4)
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/lib/replace/README | 3 | ||||
| -rw-r--r-- | source3/lib/replace/replace.h | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/source3/lib/replace/README b/source3/lib/replace/README index 8e0e659c7d..d63847556c 100644 --- a/source3/lib/replace/README +++ b/source3/lib/replace/README @@ -77,6 +77,9 @@ CHAR_BIT Macros: va_copy __FUNCTION__ +__FILE__ +__LINE__ +__location__ __STRING MIN MAX diff --git a/source3/lib/replace/replace.h b/source3/lib/replace/replace.h index a5455be2b6..0d462b613d 100644 --- a/source3/lib/replace/replace.h +++ b/source3/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 |