diff options
| author | Doug VanLeuven <roamdad@sonic.net> | 2012-12-14 13:58:30 +0100 |
|---|---|---|
| committer | David Lamparter <equinox@opensourcerouting.org> | 2013-01-11 21:50:06 +0100 |
| commit | 327c4cdf7578debcc140f04f03d02479771c9e11 (patch) | |
| tree | a0e02a0614f12601d8a58eeeebf9e54b27198c9f /zebra/redistribute_null.c | |
| parent | Merge remote-tracking branch 'savannah/sf/ospfd' (diff) | |
| download | frr-327c4cdf7578debcc140f04f03d02479771c9e11.tar.xz frr-327c4cdf7578debcc140f04f03d02479771c9e11.zip | |
testzebra: pragma weak: detect systems with weak alias and provide alternative
LLVM clang does not support #pragma weak (bug 3679) on OS X. There are
other systems where the #pragma weak has varying syntax.
Added m4 file from the autoconf archives:
http://www.gnu.org/software/autoconf-archive/ax_sys_weak_alias.html
Fix up zebra/*_null.c files to use #pragma weak alias or stub functions
if not available. It's incomplete in that the different format #pragma
enable easier fixes on need.
Tested on 64bit OS X 10.7, FreeBSD 9.0 amd64 & i386 (32bit) using
gcc & clang. Tested on linux 64bit.
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Diffstat (limited to 'zebra/redistribute_null.c')
| -rw-r--r-- | zebra/redistribute_null.c | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/zebra/redistribute_null.c b/zebra/redistribute_null.c index e57a73b9c..54198c8e6 100644 --- a/zebra/redistribute_null.c +++ b/zebra/redistribute_null.c @@ -6,21 +6,50 @@ void zebra_redistribute_add (int a, struct zserv *b, int c) { return; } +#ifdef HAVE_SYS_WEAK_ALIAS_PRAGMA #pragma weak zebra_redistribute_delete = zebra_redistribute_add #pragma weak zebra_redistribute_default_add = zebra_redistribute_add #pragma weak zebra_redistribute_default_delete = zebra_redistribute_add +#else +void zebra_redistribute_delete (int a, struct zserv *b, int c) +{ return; } +void zebra_redistribute_default_add (int a, struct zserv *b, int c) +{ return; } +void zebra_redistribute_default_delete (int a, struct zserv *b, int c) +{ return; } +#endif void redistribute_add (struct prefix *a, struct rib *b) { return; } +#ifdef HAVE_SYS_WEAK_ALIAS_PRAGMA #pragma weak redistribute_delete = redistribute_add +#else +void redistribute_delete (struct prefix *a, struct rib *b) +{ return; } +#endif void zebra_interface_up_update (struct interface *a) { return; } +#ifdef HAVE_SYS_WEAK_ALIAS_PRAGMA #pragma weak zebra_interface_down_update = zebra_interface_up_update #pragma weak zebra_interface_add_update = zebra_interface_up_update #pragma weak zebra_interface_delete_update = zebra_interface_up_update +#else +void zebra_interface_down_update (struct interface *a) +{ return; } +void zebra_interface_add_update (struct interface *a) +{ return; } +void zebra_interface_delete_update (struct interface *a) +{ return; } +#endif void zebra_interface_address_add_update (struct interface *a, struct connected *b) { return; } +#ifdef HAVE_SYS_WEAK_ALIAS_PRAGMA #pragma weak zebra_interface_address_delete_update = zebra_interface_address_add_update +#else +void zebra_interface_address_delete_update (struct interface *a, + struct connected *b) +{ return; } +#endif |