r4400 - in branches/2.0/varnish-cache: . lib/libvarnishcompat

tfheen at projects.linpro.no tfheen at projects.linpro.no
Wed Dec 16 10:26:03 CET 2009


Author: tfheen
Date: 2009-12-16 10:26:03 +0100 (Wed, 16 Dec 2009)
New Revision: 4400

Modified:
   branches/2.0/varnish-cache/configure.ac
   branches/2.0/varnish-cache/lib/libvarnishcompat/execinfo.c
Log:
Merge r4382: Use built-in backtrace function if one exists
    
This gives us backtraces on panic on when you're not using GCC too.



Modified: branches/2.0/varnish-cache/configure.ac
===================================================================
--- branches/2.0/varnish-cache/configure.ac	2009-12-16 08:59:41 UTC (rev 4399)
+++ branches/2.0/varnish-cache/configure.ac	2009-12-16 09:26:03 UTC (rev 4400)
@@ -175,6 +175,7 @@
 AC_CHECK_FUNCS([strlcat strlcpy])
 AC_CHECK_FUNCS([strndup])
 AC_CHECK_FUNCS([daemon])
+AC_CHECK_FUNCS([backtrace])
 AC_SYS_LARGEFILE
 
 save_LIBS="${LIBS}"

Modified: branches/2.0/varnish-cache/lib/libvarnishcompat/execinfo.c
===================================================================
--- branches/2.0/varnish-cache/lib/libvarnishcompat/execinfo.c	2009-12-16 08:59:41 UTC (rev 4399)
+++ branches/2.0/varnish-cache/lib/libvarnishcompat/execinfo.c	2009-12-16 09:26:03 UTC (rev 4400)
@@ -28,6 +28,8 @@
 
 #include "config.h"
 
+#ifndef HAVE_BACKTRACE
+
 #include "compat/execinfo.h"
 
 #if defined (__GNUC__) && __GNUC__ >= 4	/* XXX Correct version to check for ? */
@@ -427,4 +429,5 @@
 	return (0);
 }
 
-#endif
+#endif /*  (__GNUC__) && __GNUC__ >= 4 */
+#endif /* HAVE_BACKTRACE */



More information about the varnish-commit mailing list