[master] 86619ad A couple of cleanups to get OSX to be more happy.

Poul-Henning Kamp phk at varnish-cache.org
Wed Aug 22 11:31:38 CEST 2012


commit 86619addc250bede7f6be2f635fe0cf1deb067ea
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Wed Aug 22 09:31:21 2012 +0000

    A couple of cleanups to get OSX to be more happy.

diff --git a/bin/varnishd/storage/storage_persistent.h b/bin/varnishd/storage/storage_persistent.h
index a755b89..c817faf 100644
--- a/bin/varnishd/storage/storage_persistent.h
+++ b/bin/varnishd/storage/storage_persistent.h
@@ -34,7 +34,7 @@
  */
 
 #define ASSERT_SILO_THREAD(sc) \
-    do {assert(pthread_self() == (sc)->thread);} while (0)
+    do {assert(pthread_equal(pthread_self(), (sc)->thread));} while (0)
 
 #define OC_F_NEEDFIXUP OC_F_PRIV
 
diff --git a/bin/varnishtest/tests/r01035.vtc b/bin/varnishtest/tests/r01035.vtc
index ccd6078..4bcb735 100644
--- a/bin/varnishtest/tests/r01035.vtc
+++ b/bin/varnishtest/tests/r01035.vtc
@@ -1,6 +1,6 @@
 varnishtest "Test case for #1035"
 
-varnish v1 -arg "-a 127.0.0.1:80 -b localhost:8080"
+varnish v1 -arg "-a 127.0.0.1:80 -b 127.0.0.1:8080"
 varnish v1 -cliok "param.set listen_address 127.0.0.1:80"
 varnish v1 -clierr 106 "param.set listen_address 127.0.0.1:65540"
 varnish v1 -clierr 106 "param.set listen_address 127.0.0.1:65536"



More information about the varnish-commit mailing list