Pablo Neira Ayuso <pablo@netfilter.org>:

o remove .svn directory from make distcheck tarballs (reported by B.Benjamini)
+
Krzysztof Oledzki <ole@ans.pl>:
o fix minor compilation warning

4 files changed, 12 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 13ac4fe..6a33399 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+version 0.9.7 (yet unreleased)
+------------------------------
+
+Pablo Neira Ayuso <pablo@netfilter.org>:
+o remove .svn directory from make distcheck tarballs (reported by B.Benjamini)
+
+Krzysztof Oledzki <ole@ans.pl>:
+o fix minor compilation warning
+
 version 0.9.6 (2008/03/08)
 ------------------------------
 
diff --git a/configure.in b/configure.in
index 920f42f..a98a324 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-AC_INIT(conntrack-tools, 0.9.6, pablo@netfilter.org)
+AC_INIT(conntrack-tools, 0.9.7, pablo@netfilter.org)
 
 AC_CANONICAL_SYSTEM
 
diff --git a/include/network.h b/include/network.h
index 92a8490..e4ebec4 100644
--- a/include/network.h
+++ b/include/network.h
@@ -61,7 +61,7 @@ int mcast_track_seq(uint32_t seq, uint32_t *exp_seq);
 
 struct mcast_conf;
 
-int mcast_buffered_init(struct mcast_conf *conf);
+int mcast_buffered_init(struct mcast_conf *mconf);
 void mcast_buffered_destroy(void);
 int mcast_buffered_send_netmsg(struct mcast_sock *m, void *data, size_t len);
 ssize_t mcast_buffered_pending_netmsg(struct mcast_sock *m);
diff --git a/include/state_helper.h b/include/state_helper.h
index 0015890..1a68b04 100644
--- a/include/state_helper.h
+++ b/include/state_helper.h
@@ -17,6 +17,6 @@ struct state_replication_helper {
 };
 
 int state_helper_verdict(int type, struct nf_conntrack *ct);
-void state_helper_register(struct state_replication_helper *h, int state);
+void state_helper_register(struct state_replication_helper *h, int h_state);
 
 #endif