[3.0] fde20f7 A couple of cleanups to get OSX to be more happy.

[Tollef Fog Heen]

commit fde20f7adb6cd51cff84fe4731f3b9da1ed3217f
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_persistent.h b/bin/varnishd/storage_persistent.h
index 2a5bd77..9536ab8 100644
--- a/bin/varnishd/storage_persistent.h
+++ b/bin/varnishd/storage_persistent.h
@@ -42,7 +42,7 @@
 #endif
 
 #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"