X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fethernet.h;h=4ef9dab935b64ab4306d8586b90f70347ed9c7de;hb=373b0c12d9d0e8a3b449fd18be704e28dd6403e1;hp=0b4a1db06b216eb645ee3fc21efcedec108e2874;hpb=aebaaa8db80ec3931346af710f2182d129c74c41;p=tinc diff --git a/src/ethernet.h b/src/ethernet.h index 0b4a1db0..4ef9dab9 100644 --- a/src/ethernet.h +++ b/src/ethernet.h @@ -1,3 +1,6 @@ +#ifndef TINC_ETHERNET_H +#define TINC_ETHERNET_H + /* ethernet.h -- missing Ethernet related definitions Copyright (C) 2005 Ivo Timmermans @@ -18,8 +21,7 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef __TINC_ETHERNET_H__ -#define __TINC_ETHERNET_H__ +#include "system.h" #ifndef ETH_ALEN #define ETH_ALEN 6 @@ -63,7 +65,7 @@ struct ether_header { uint8_t ether_dhost[ETH_ALEN]; uint8_t ether_shost[ETH_ALEN]; uint16_t ether_type; -} __attribute__ ((__gcc_struct__, __packed__)); +}; #endif #ifndef HAVE_STRUCT_ARPHDR @@ -73,7 +75,7 @@ struct arphdr { uint8_t ar_hln; uint8_t ar_pln; uint16_t ar_op; -} __attribute__ ((__gcc_struct__, __packed__)); +}; #define ARPOP_REQUEST 1 #define ARPOP_REPLY 2 @@ -91,7 +93,7 @@ struct ether_arp { uint8_t arp_spa[4]; uint8_t arp_tha[ETH_ALEN]; uint8_t arp_tpa[4]; -} __attribute__ ((__gcc_struct__, __packed__)); +}; #define arp_hrd ea_hdr.ar_hrd #define arp_pro ea_hdr.ar_pro #define arp_hln ea_hdr.ar_hln @@ -99,4 +101,4 @@ struct ether_arp { #define arp_op ea_hdr.ar_op #endif -#endif /* __TINC_ETHERNET_H__ */ +#endif