summaryrefslogtreecommitdiffstats
path: root/zebra
diff options
context:
space:
mode:
authorChris Hall <GMCH@hestia.halldom.com>2010-04-17 10:54:47 +0100
committerChris Hall <GMCH@hestia.halldom.com>2010-04-17 10:54:47 +0100
commit68297cc9dc2eb920dd6e956d0d55098ea9edaafc (patch)
treec0df43727c1eaf78915caa98433d39028b6a4902 /zebra
parentd78a0a9e3552c77be930aa30f04786f0c5214a6f (diff)
downloadquagga-68297cc9dc2eb920dd6e956d0d55098ea9edaafc.tar.bz2
quagga-68297cc9dc2eb920dd6e956d0d55098ea9edaafc.tar.xz
Put back some Quagga additions to getopt.c etc.
Also, backed out a small change in zebra/misc_null.c, which removed a warning, but on reflection may be using deep magic which is not fully understood (by me, anyway). zebra appears to have a number of definitions for the same function, and how that is all linked is not obvious (to me, anyway).
Diffstat (limited to 'zebra')
-rw-r--r--zebra/misc_null.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/zebra/misc_null.c b/zebra/misc_null.c
index d1d17f71..f0269ec2 100644
--- a/zebra/misc_null.c
+++ b/zebra/misc_null.c
@@ -5,8 +5,7 @@
#include "zebra/irdp.h"
#include "zebra/interface.h"
-extern void ifstat_update_proc (void) ;
-extern void ifstat_update_proc (void) { return; } ;
+void ifstat_update_proc (void) { return; } ;
#pragma weak rtadv_config_write = ifstat_update_proc
#pragma weak irdp_config_write = ifstat_update_proc