Skip to content

Commit

Permalink
Define ETH_ALEN in generic <netinet/if_ether.h>.
Browse files Browse the repository at this point in the history
  • Loading branch information
Roland McGrath committed Mar 5, 2015
1 parent 2752f33 commit 8bff5aa
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
4 changes: 4 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
6 changes: 3 additions & 3 deletions sysdeps/generic/netinet/if_ether.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */

0 comments on commit 8bff5aa

Please sign in to comment.