From: phk <phk@d4fa192b-c00b-0410-8231-f00ffab90ce4>
Date: Mon, 7 Aug 2006 17:10:26 +0000 (+0000)
Subject: Call __assert() lbv_assert() instead.
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f3a194cbab7a2acb245206c1e03558cca9fcb54d;p=varnish

Call __assert() lbv_assert() instead.


git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@743 d4fa192b-c00b-0410-8231-f00ffab90ce4
---

diff --git a/varnish-cache/include/libvarnish.h b/varnish-cache/include/libvarnish.h
index d0684b93..02c8431e 100644
--- a/varnish-cache/include/libvarnish.h
+++ b/varnish-cache/include/libvarnish.h
@@ -23,11 +23,11 @@ void varnish_version(const char *);
 #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)
diff --git a/varnish-cache/lib/libvarnish/assert.c b/varnish-cache/lib/libvarnish/assert.c
index 53f02c0c..2f8ea7cc 100644
--- a/varnish-cache/lib/libvarnish/assert.c
+++ b/varnish-cache/lib/libvarnish/assert.c
@@ -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,