svn commit: samba r22275 - in branches/SAMBA_3_0_25/source/lib/replace: .

[metze at samba.org]

Author: metze
Date: 2007-04-16 19:46:50 +0000 (Mon, 16 Apr 2007)
New Revision: 22275

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=22275

Log:
merge from samba4:

- provide __LINESTR__ macro
- add __STRINGSTRING() macro to really create a string of __LINE__
- fix __location__ macro

metze
Modified:
   branches/SAMBA_3_0_25/source/lib/replace/README
   branches/SAMBA_3_0_25/source/lib/replace/replace.h


Changeset:
Modified: branches/SAMBA_3_0_25/source/lib/replace/README
===================================================================
--- branches/SAMBA_3_0_25/source/lib/replace/README	2007-04-16 19:46:06 UTC (rev 22274)
+++ branches/SAMBA_3_0_25/source/lib/replace/README	2007-04-16 19:46:50 UTC (rev 22275)
@@ -79,8 +79,10 @@
 __FUNCTION__
 __FILE__
 __LINE__
+__LINESTR__
 __location__
 __STRING
+__STRINGSTRING
 MIN
 MAX
 QSORT_CAST

Modified: branches/SAMBA_3_0_25/source/lib/replace/replace.h
===================================================================
--- branches/SAMBA_3_0_25/source/lib/replace/replace.h	2007-04-16 19:46:06 UTC (rev 22274)
+++ branches/SAMBA_3_0_25/source/lib/replace/replace.h	2007-04-16 19:46:50 UTC (rev 22275)
@@ -439,8 +439,16 @@
 #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