Thu Feb 19 22:27:15 2015 UTC ()

locks only exists for pthread_mutex_lock and friends, don't use it
otherwise.


(joerg)

diff -r1.6 -r1.7 pkgsrc/net/ser/distinfo
diff -r0 -r1.1 pkgsrc/net/ser/patches/patch-modules_pike_ip__tree.c

--- pkgsrc/net/ser/distinfo 2013/09/10 14:37:50 1.6
+++ pkgsrc/net/ser/distinfo 2015/02/19 22:27:15 1.7

 @@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.6 2013/09/10 14:37:50 joerg Exp $
+$NetBSD: distinfo,v 1.7 2015/02/19 22:27:15 joerg Exp $
 SHA1 (ser-0.8.14_src.tar.gz) = 91553951247506850d66da25819333b61b150d1d
 RMD160 (ser-0.8.14_src.tar.gz) = 72c3a0793f3dd88584ee65b3751ccf8a3776f840
 Size (ser-0.8.14_src.tar.gz) = 1551881 bytes
 SHA1 (patch-aa) = 95971192dea5bee4120b4db3b2f0c7810385bb6e
 SHA1 (patch-ab) = 871de5c826853381eb5b6889d8e3d8b2f310dc6b
 SHA1 (patch-ac) = ece24eec7175c1396d76e2b85ff69a4b995e541e
 SHA1 (patch-ad) = 54fc24c84cc4c3261f1b40faa2124ef5506e5e00
 SHA1 (patch-modules_pike_ip__tree.c) = 74c575be92fa9641988e73ecd5ed3c4dc3da4a0c

$NetBSD: patch-modules_pike_ip__tree.c,v 1.1 2015/02/19 22:27:15 joerg Exp $

--- modules/pike/ip_tree.c.orig	2015-02-19 18:45:06.000000000 +0000
+++ modules/pike/ip_tree.c
@@ -105,7 +105,9 @@ int init_ip_tree(int maximum_hits)
 
 	for(i=0;i<MAX_IP_BRANCHES;i++) {
 		root->entries[i].node = 0;
+#if defined(FAST_LOCK) || defined(USE_PTHREAD_MUTEX) || defined(USE_POSIX_SEM)
 		root->entries[i].lock = &(root->entry_lock_set->locks[i]);
+#endif
 	}
 
 	root->max_hits = maximum_hits;