diff options
| author | David Lamparter <equinox@opensourcerouting.org> | 2015-03-03 09:14:46 +0100 |
|---|---|---|
| committer | David Lamparter <equinox@opensourcerouting.org> | 2015-04-21 10:18:28 +0200 |
| commit | a3466abd93f83424f9f83e56282e42188e1f94ce (patch) | |
| tree | ca3359fa701f5d1cac8e4d711c62fadb234d6563 | |
| parent | 3e9e2c9fb66895df42159b98a3743e25399760df (diff) | |
| download | quagga-a3466abd93f83424f9f83e56282e42188e1f94ce.tar.bz2 quagga-a3466abd93f83424f9f83e56282e42188e1f94ce.tar.xz | |
zebra: clean up misc_null pragmas
The no-op alternatives provided in misc_null trigger a few warnings
since they provide functions / use pragmas without prototypes.
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
| -rw-r--r-- | zebra/misc_null.c | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/zebra/misc_null.c b/zebra/misc_null.c index b4416e63..18977d2f 100644 --- a/zebra/misc_null.c +++ b/zebra/misc_null.c @@ -27,16 +27,27 @@ #include "zebra/interface.h" #include "zebra/zebra_fpm.h" -void ifstat_update_proc (void) { return; } #ifdef HAVE_SYS_WEAK_ALIAS_PRAGMA -#pragma weak rtadv_config_write = ifstat_update_proc -#pragma weak irdp_config_write = ifstat_update_proc -#pragma weak ifstat_update_sysctl = ifstat_update_proc +void _quagga_noop (void); +void _quagga_noop (void) { return; } +#pragma weak rtadv_config_write = _quagga_noop +#pragma weak irdp_config_write = _quagga_noop +#ifdef HAVE_NET_RT_IFLIST +#pragma weak ifstat_update_sysctl = _quagga_noop +#endif +#ifdef HAVE_PROC_NET_DEV +#pragma weak ifstat_update_proc = _quagga_noop +#endif #else void rtadv_config_write (struct vty *vty, struct interface *ifp) { return; } void irdp_config_write (struct vty *vty, struct interface *ifp) { return; } +#ifdef HAVE_PROC_NET_DEV +void ifstat_update_proc (void) { return; } +#endif +#ifdef HAVE_NET_RT_IFLIST void ifstat_update_sysctl (void) { return; } #endif +#endif void zfpm_trigger_update (struct route_node *rn, const char *reason) |