Merge branch 'feat_misc' into beta2.2

Conflicts:
	acinclude.m4
	config-win32.h
	configure.ac
	misc.c
	thread.c
	thread.h
        - These conflicts was mainly due to feat_misc getting old
          and mostly caused by the pthread clean-up patches in
          feat_misc

Signed-off-by: David Sommerseth <dazo@users.sourceforge.net>

1 files changed, 1 insertions, 1 deletions

diff --git a/pf.c b/pf.c
index aed836e..6b4cba4 100644
--- a/pf.c
+++ b/pf.c
@@ -644,7 +644,7 @@ pf_cn_set_print (const struct pf_cn_set *s, const int lev)
 
       if (s->hash_table)
 	{
-	  hash_iterator_init (s->hash_table, &hi, false);
+	  hash_iterator_init (s->hash_table, &hi);
 	  while ((he = hash_iterator_next (&hi)))
 	    {
 	      struct pf_cn *e = (struct pf_cn *)he->value;