You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
126 lines
4.8 KiB
126 lines
4.8 KiB
Index: bin/varnishd/common.h |
|
--- bin/varnishd/common.h.orig 2010-10-21 10:57:22.000000000 +0200 |
|
+++ bin/varnishd/common.h 2010-12-12 12:52:59.000000000 +0100 |
|
@@ -53,6 +53,10 @@ |
|
|
|
#define TRUST_ME(ptr) ((void*)(uintptr_t)(ptr)) |
|
|
|
+#ifndef NAN |
|
+#define NAN (__builtin_nanf("")) |
|
+#endif |
|
+ |
|
/* Really belongs in mgt.h, but storage_file chokes on both */ |
|
void mgt_child_inherit(int fd, const char *what); |
|
|
|
Index: bin/varnishhist/Makefile.in |
|
--- bin/varnishhist/Makefile.in.orig 2010-10-21 10:58:08.000000000 +0200 |
|
+++ bin/varnishhist/Makefile.in 2010-12-12 12:52:59.000000000 +0100 |
|
@@ -241,9 +241,9 @@ |
|
@HAVE_RST2MAN_TRUE@dist_man_MANS = varnishhist.1 |
|
varnishhist_SOURCES = varnishhist.c |
|
varnishhist_LDADD = \ |
|
+ $(top_builddir)/lib/libvarnishapi/libvarnishapi.la \ |
|
$(top_builddir)/lib/libvarnish/libvarnish.la \ |
|
$(top_builddir)/lib/libvarnishcompat/libvarnishcompat.la \ |
|
- $(top_builddir)/lib/libvarnishapi/libvarnishapi.la \ |
|
-lm \ |
|
${CURSES_LIBS} ${PTHREAD_LIBS} |
|
|
|
Index: bin/varnishlog/Makefile.in |
|
--- bin/varnishlog/Makefile.in.orig 2010-10-21 10:58:09.000000000 +0200 |
|
+++ bin/varnishlog/Makefile.in 2010-12-12 12:52:59.000000000 +0100 |
|
@@ -55,9 +55,9 @@ |
|
varnishlog_OBJECTS = $(am_varnishlog_OBJECTS) |
|
am__DEPENDENCIES_1 = |
|
varnishlog_DEPENDENCIES = \ |
|
+ $(top_builddir)/lib/libvarnishapi/libvarnishapi.la \ |
|
$(top_builddir)/lib/libvarnish/libvarnish.la \ |
|
$(top_builddir)/lib/libvarnishcompat/libvarnishcompat.la \ |
|
- $(top_builddir)/lib/libvarnishapi/libvarnishapi.la \ |
|
$(am__DEPENDENCIES_1) |
|
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) |
|
depcomp = $(SHELL) $(top_srcdir)/depcomp |
|
Index: bin/varnishncsa/Makefile.in |
|
--- bin/varnishncsa/Makefile.in.orig 2010-10-21 10:58:09.000000000 +0200 |
|
+++ bin/varnishncsa/Makefile.in 2010-12-12 12:52:59.000000000 +0100 |
|
@@ -241,9 +241,9 @@ |
|
@HAVE_RST2MAN_TRUE@dist_man_MANS = varnishncsa.1 |
|
varnishncsa_SOURCES = varnishncsa.c |
|
varnishncsa_LDADD = \ |
|
+ $(top_builddir)/lib/libvarnishapi/libvarnishapi.la \ |
|
$(top_builddir)/lib/libvarnish/libvarnish.la \ |
|
$(top_builddir)/lib/libvarnishcompat/libvarnishcompat.la \ |
|
- $(top_builddir)/lib/libvarnishapi/libvarnishapi.la \ |
|
${PTHREAD_LIBS} |
|
|
|
all: all-am |
|
Index: bin/varnishreplay/Makefile.in |
|
--- bin/varnishreplay/Makefile.in.orig 2010-10-21 10:58:09.000000000 +0200 |
|
+++ bin/varnishreplay/Makefile.in 2010-12-12 12:52:59.000000000 +0100 |
|
@@ -243,9 +243,9 @@ |
|
varnishreplay.c |
|
|
|
varnishreplay_LDADD = \ |
|
+ $(top_builddir)/lib/libvarnishapi/libvarnishapi.la \ |
|
$(top_builddir)/lib/libvarnish/libvarnish.la \ |
|
$(top_builddir)/lib/libvarnishcompat/libvarnishcompat.la \ |
|
- $(top_builddir)/lib/libvarnishapi/libvarnishapi.la \ |
|
${PTHREAD_LIBS} ${NET_LIBS} |
|
|
|
all: all-am |
|
Index: bin/varnishsizes/Makefile.in |
|
--- bin/varnishsizes/Makefile.in.orig 2010-10-21 10:58:09.000000000 +0200 |
|
+++ bin/varnishsizes/Makefile.in 2010-12-12 12:52:59.000000000 +0100 |
|
@@ -241,9 +241,9 @@ |
|
dist_man_MANS = varnishsizes.1 |
|
varnishsizes_SOURCES = varnishsizes.c |
|
varnishsizes_LDADD = \ |
|
+ $(top_builddir)/lib/libvarnishapi/libvarnishapi.la \ |
|
$(top_builddir)/lib/libvarnish/libvarnish.la \ |
|
$(top_builddir)/lib/libvarnishcompat/libvarnishcompat.la \ |
|
- $(top_builddir)/lib/libvarnishapi/libvarnishapi.la \ |
|
-lm \ |
|
${CURSES_LIBS} ${PTHREAD_LIBS} |
|
|
|
Index: bin/varnishstat/Makefile.in |
|
--- bin/varnishstat/Makefile.in.orig 2010-10-21 10:58:09.000000000 +0200 |
|
+++ bin/varnishstat/Makefile.in 2010-12-12 12:52:59.000000000 +0100 |
|
@@ -242,9 +242,9 @@ |
|
@HAVE_RST2MAN_TRUE@dist_man_MANS = varnishstat.1 |
|
varnishstat_SOURCES = varnishstat.c |
|
varnishstat_LDADD = \ |
|
+ $(top_builddir)/lib/libvarnishapi/libvarnishapi.la \ |
|
$(top_builddir)/lib/libvarnish/libvarnish.la \ |
|
$(top_builddir)/lib/libvarnishcompat/libvarnishcompat.la \ |
|
- $(top_builddir)/lib/libvarnishapi/libvarnishapi.la \ |
|
${CURSES_LIBS} ${RT_LIBS} ${PTHREAD_LIBS} |
|
|
|
all: all-am |
|
Index: bin/varnishtest/Makefile.in |
|
--- bin/varnishtest/Makefile.in.orig 2010-10-21 10:58:09.000000000 +0200 |
|
+++ bin/varnishtest/Makefile.in 2010-12-12 12:52:59.000000000 +0100 |
|
@@ -257,9 +257,9 @@ |
|
vtc_varnish.c |
|
|
|
varnishtest_LDADD = \ |
|
+ $(top_builddir)/lib/libvarnishapi/libvarnishapi.la \ |
|
$(top_builddir)/lib/libvarnish/libvarnish.la \ |
|
$(top_builddir)/lib/libvarnishcompat/libvarnishcompat.la \ |
|
- $(top_builddir)/lib/libvarnishapi/libvarnishapi.la \ |
|
${LIBM} ${PTHREAD_LIBS} |
|
|
|
EXTRA_DIST = $(top_srcdir)/bin/varnishtest/tests/*.vtc \ |
|
Index: bin/varnishtop/Makefile.in |
|
--- bin/varnishtop/Makefile.in.orig 2010-10-21 10:58:09.000000000 +0200 |
|
+++ bin/varnishtop/Makefile.in 2010-12-12 12:52:59.000000000 +0100 |
|
@@ -241,9 +241,9 @@ |
|
@HAVE_RST2MAN_TRUE@dist_man_MANS = varnishtop.1 |
|
varnishtop_SOURCES = varnishtop.c |
|
varnishtop_LDADD = \ |
|
+ $(top_builddir)/lib/libvarnishapi/libvarnishapi.la \ |
|
$(top_builddir)/lib/libvarnish/libvarnish.la \ |
|
$(top_builddir)/lib/libvarnishcompat/libvarnishcompat.la \ |
|
- $(top_builddir)/lib/libvarnishapi/libvarnishapi.la \ |
|
${CURSES_LIBS} ${PTHREAD_LIBS} |
|
|
|
all: all-am
|
|
|