summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland McGrath <roland@hack.frob.com>2015-03-04 16:11:31 -0800
committerRoland McGrath <roland@hack.frob.com>2015-03-04 16:11:31 -0800
commit8bff5aab5bce71b4d8b92cb9dc575054ae68b9db (patch)
treeaff58d484b9eb9b7320948aca45067ac1ac98760
parent2752f3381b013df24752488488a4cc6e4716fd95 (diff)
downloadglibc-8bff5aab5bce71b4d8b92cb9dc575054ae68b9db.tar.gz
Define ETH_ALEN in generic <netinet/if_ether.h>.
-rw-r--r--ChangeLog4
-rw-r--r--sysdeps/generic/netinet/if_ether.h6
2 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 9147b38492..d4cfc27bfc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2015-03-04 Roland McGrath <roland@hack.frob.com>
+ * sysdeps/generic/netinet/if_ether.h: Don't #include <features.h>.
+ (ETH_ALEN): New macro.
+ (struct ether_addr): Use it for length of ether_addr_octet.
+
* nss/test-netdb.c: Don't #include <rpc/netdb.h>.
(setdb): Don't call __nss_configure_lookup for "rpc".
(do_test): Don't call test_rpc.
diff --git a/sysdeps/generic/netinet/if_ether.h b/sysdeps/generic/netinet/if_ether.h
index 24ffd8b5ba..54dbf47ef8 100644
--- a/sysdeps/generic/netinet/if_ether.h
+++ b/sysdeps/generic/netinet/if_ether.h
@@ -16,17 +16,17 @@
<http://www.gnu.org/licenses/>. */
#ifndef __NETINET_IF_ETHER_H
-
#define __NETINET_IF_ETHER_H 1
-#include <features.h>
#include <sys/types.h>
+#define ETH_ALEN 6 /* Octets in one ethernet address. */
+
/* This is a name for the 48 bit ethernet address available on many
systems. */
struct ether_addr
{
- u_int8_t ether_addr_octet[6];
+ u_int8_t ether_addr_octet[ETH_ALEN];
} __attribute__ ((__packed__));
#endif /* netinet/if_ether.h */