r743 - in trunk/varnish-cache: include lib/libvarnish

[phk at projects.linpro.no]

Author: phk
Date: 2006-08-07 19:10:26 +0200 (Mon, 07 Aug 2006)
New Revision: 743

Modified:
   trunk/varnish-cache/include/libvarnish.h
   trunk/varnish-cache/lib/libvarnish/assert.c
Log:
Call __assert() lbv_assert() instead.


Modified: trunk/varnish-cache/include/libvarnish.h
===================================================================
--- trunk/varnish-cache/include/libvarnish.h	2006-08-07 17:08:35 UTC (rev 742)
+++ trunk/varnish-cache/include/libvarnish.h	2006-08-07 17:10:26 UTC (rev 743)
@@ -23,11 +23,11 @@
 #define assert(e)							\
 do { 									\
 	if (e)								\
-		__assert(__func__, __FILE__, __LINE__, #e, errno);	\
+		lbv_assert(__func__, __FILE__, __LINE__, #e, errno);	\
 } while (0)
 #endif
 
-void __assert(const char *, const char *, int, const char *, int);
+void lbv_assert(const char *, const char *, int, const char *, int);
 
 /* Assert zero return value */
 #define AZ(foo)	do { assert((foo) == 0); } while (0)

Modified: trunk/varnish-cache/lib/libvarnish/assert.c
===================================================================
--- trunk/varnish-cache/lib/libvarnish/assert.c	2006-08-07 17:08:35 UTC (rev 742)
+++ trunk/varnish-cache/lib/libvarnish/assert.c	2006-08-07 17:10:26 UTC (rev 743)
@@ -10,7 +10,7 @@
 #include "libvarnish.h"
 
 void
-__assert(const char *func, const char *file, int line, const char *cond, int err)
+lbv_assert(const char *func, const char *file, int line, const char *cond, int err)
 {
 
 	fprintf(stderr,