From ceabf7a47a51d129368080ac04e692d5c3591244 Mon Sep 17 00:00:00 2001 From: pdw <> Date: Sun, 19 Jan 2014 20:28:31 +0000 Subject: [PATCH] Fixed various compilation issues. --- configure.ac | 2 +- iftop.c | 4 ++-- options.c | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index af7f19f..f2e026a 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ dnl dnl Boilerplate configuration dnl -AC_INIT([iftop], [1.0pre2], [pdw@ex-parrot.com], [http://www.ex-parrot.com/pdw/iftop/]) +AC_INIT([iftop], [1.0pre4], [pdw@ex-parrot.com], [iftop], [http://www.ex-parrot.com/pdw/iftop/]) AC_CONFIG_AUX_DIR(config) diff --git a/iftop.c b/iftop.c index 42fca2f..a090dcf 100644 --- a/iftop.c +++ b/iftop.c @@ -177,11 +177,11 @@ int in_filter_net(struct in_addr addr) { return ret; } -int __inline__ ip_addr_match(struct in_addr addr) { +static int __inline__ ip_addr_match(struct in_addr addr) { return addr.s_addr == if_ip_addr.s_addr; } -int __inline__ ip6_addr_match(struct in6_addr *addr) { +static int __inline__ ip6_addr_match(struct in6_addr *addr) { return IN6_ARE_ADDR_EQUAL(addr, &if_ip6_addr); } diff --git a/options.c b/options.c index be7a6e8..b438d4c 100644 --- a/options.c +++ b/options.c @@ -215,7 +215,6 @@ static void usage(FILE *fp) { "copyright (c) 2002 Paul Warren and contributors\n" ); } -#endif /* Obsolete code? */ void options_read_args(int argc, char **argv) { int opt;