diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2013-10-18 15:52:13 +0200 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2013-10-31 13:18:49 +0100 |
| commit | 4e14deda1cded14091ed2b37e1144c7f31a9b2de (patch) | |
| tree | 722df13c503c5a098cdb36d3aef157c85f22a7fc /freebsd/sbin/ifconfig/ifconfig.c | |
| parent | Use unmodified FreeBSD versions for port_*.h (diff) | |
| download | rtems-libbsd-4e14deda1cded14091ed2b37e1144c7f31a9b2de.tar.bz2 | |
IFCONFIG(8): Workaround for struct option confict
Diffstat (limited to 'freebsd/sbin/ifconfig/ifconfig.c')
| -rw-r--r-- | freebsd/sbin/ifconfig/ifconfig.c | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/freebsd/sbin/ifconfig/ifconfig.c b/freebsd/sbin/ifconfig/ifconfig.c index 078eae98..dfbe1981 100644 --- a/freebsd/sbin/ifconfig/ifconfig.c +++ b/freebsd/sbin/ifconfig/ifconfig.c @@ -43,7 +43,9 @@ static const char rcsid[] = #ifdef __rtems__ #define __need_getopt_newlib +#define option getopt_option #include <getopt.h> +#undef option #endif /* __rtems__ */ #include <rtems/bsd/sys/param.h> #include <sys/ioctl.h> @@ -114,16 +116,6 @@ static struct afswtch *af_getbyname(const char *name); static struct afswtch *af_getbyfamily(int af); static void af_other_status(int); -#ifdef __rtems__ -static struct ifconfig_option *opts = NULL; - -void -opt_register(struct ifconfig_option *p) -{ - p->next = opts; - opts = p; -} -#else static struct option *opts = NULL; void @@ -132,17 +124,12 @@ opt_register(struct option *p) p->next = opts; opts = p; } -#endif static void usage(void) { char options[1024]; - #ifdef __rtems__ - struct ifconfig_option *p; - #else struct option *p; - #endif /* XXX not right but close enough for now */ options[0] = '\0'; @@ -190,11 +177,7 @@ main(int argc, char *argv[]) const struct sockaddr_dl *sdl; char options[1024], *cp; const char *ifname; -#ifdef __rtems__ - struct ifconfig_option *p; -#else struct option *p; -#endif size_t iflen; #ifdef __rtems__ struct getopt_data getopt_data; |