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 d0684b93fcdd40945a41b5c996647f4efb0140a7..02c8431e28dce6d69837fe2c5ae39f08f4ae70c4 100644 (file)
--- 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 53f02c0c1c7fc6e6aeac57c0d8fe3d156e83eb45..2f8ea7cce568d237e56f2d28215128c16ee63ab7 100644 (file)
--- 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,