diff options
| author | Kylie McClain <somasis@exherbo.org> | 2016-06-22 22:50:36 -0400 |
|---|---|---|
| committer | Stephen Hemminger <sthemmin@microsoft.com> | 2016-08-17 15:59:06 -0700 |
| commit | 44d276b223d8f57c892cb0a18a1ab87917baa1ea (patch) | |
| tree | 6d4a2bfe78bdde8b00795706a96449d998b728d9 | |
| parent | 76f97da7584a13bf52a0ca59ca748b3b36dab601 (diff) | |
| download | bridge-utils-44d276b223d8f57c892cb0a18a1ab87917baa1ea.tar.gz | |
Fix building on musl libc
- Silence warnings:
errno.h is defined by POSIX, sys/errno.h is a glibcism, same with
fcntl.h vs. sys/fcntl.h
- Use standard types rather than _GNU_SOURCE-exposed types
u_int16_t -> uint16_t
u_int8_t -> uint8_t
| -rw-r--r-- | brctl/brctl.c | 2 | ||||
| -rw-r--r-- | libbridge/libbridge.h | 13 | ||||
| -rw-r--r-- | libbridge/libbridge_devif.c | 2 | ||||
| -rw-r--r-- | libbridge/libbridge_if.c | 2 |
4 files changed, 10 insertions, 9 deletions
diff --git a/brctl/brctl.c b/brctl/brctl.c index 46ca352..8855234 100644 --- a/brctl/brctl.c +++ b/brctl/brctl.c @@ -19,7 +19,7 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <sys/errno.h> +#include <errno.h> #include <getopt.h> #include "libbridge.h" diff --git a/libbridge/libbridge.h b/libbridge/libbridge.h index dd14bae..ff047f9 100644 --- a/libbridge/libbridge.h +++ b/libbridge/libbridge.h @@ -19,6 +19,7 @@ #ifndef _LIBBRIDGE_H #define _LIBBRIDGE_H +#include <sys/types.h> #include <sys/socket.h> #include <netinet/in.h> #include <linux/if.h> @@ -46,7 +47,7 @@ struct bridge_info struct timeval bridge_max_age; struct timeval bridge_hello_time; struct timeval bridge_forward_delay; - u_int16_t root_port; + uint16_t root_port; unsigned char stp_enabled; unsigned char topology_change; unsigned char topology_change_detected; @@ -59,8 +60,8 @@ struct bridge_info struct fdb_entry { - u_int8_t mac_addr[6]; - u_int16_t port_no; + uint8_t mac_addr[6]; + uint16_t port_no; unsigned char is_local; struct timeval ageing_timer_value; }; @@ -70,9 +71,9 @@ struct port_info unsigned port_no; struct bridge_id designated_root; struct bridge_id designated_bridge; - u_int16_t port_id; - u_int16_t designated_port; - u_int8_t priority; + uint16_t port_id; + uint16_t designated_port; + uint8_t priority; unsigned char top_change_ack; unsigned char config_pending; unsigned char state; diff --git a/libbridge/libbridge_devif.c b/libbridge/libbridge_devif.c index 1e83925..2cf78f6 100644 --- a/libbridge/libbridge_devif.c +++ b/libbridge/libbridge_devif.c @@ -23,7 +23,7 @@ #include <errno.h> #include <string.h> #include <dirent.h> -#include <sys/fcntl.h> +#include <fcntl.h> #include "libbridge.h" #include "libbridge_private.h" diff --git a/libbridge/libbridge_if.c b/libbridge/libbridge_if.c index 77d3f8a..9cf4bac 100644 --- a/libbridge/libbridge_if.c +++ b/libbridge/libbridge_if.c @@ -20,7 +20,7 @@ #include <stdlib.h> #include <errno.h> #include <string.h> -#include <sys/fcntl.h> +#include <fcntl.h> #include <sys/ioctl.h> #include "libbridge.h" |