[zebra] Fix mistake in previous commit and further compile warnings/errors.
2005-11-24 Paul Jakma <paul.jakma@sun.com>
* kernel_socket.h: New header for functions exported to sysctl
methods.
* kernel_socket.c: include previous.
Remove static qualifier from couple of functions which are
used by sysctl methods, incorrectly added in previous commit.
Add a workaround for a bogus gcc warning to the RTA_ macros.
* Makefile.am: Add kernel_socket.h to noinst_HEADERS
* if_sysctl.c: include rt.h and kernel_socket.h and remove
redundant prototypes.
* rtread_sysctl.c: ditto.
(route_read) fix mismatch of return values.
* {rt,zserv,rib}.h: Include lib headers depended on.
diff --git a/zebra/if_sysctl.c b/zebra/if_sysctl.c
index 7ad570f..f1e3dcd 100644
--- a/zebra/if_sysctl.c
+++ b/zebra/if_sysctl.c
@@ -30,6 +30,9 @@
#include "ioctl.h"
#include "log.h"
+#include "zebra/rt.h"
+#include "zebra/kernel_socket.h"
+
int
ifstat_update_sysctl ()
{
@@ -91,8 +94,6 @@
caddr_t ref, buf, end;
size_t bufsiz;
struct if_msghdr *ifm;
- int ifm_read (struct if_msghdr *);
- int ifam_read (struct ifa_msghdr *);
#define MIBSIZ 6
int mib[MIBSIZ] =