diff options
| author | Mark Andrews <marka@isc.org> | 2008-01-23 22:49:54 +0000 |
|---|---|---|
| committer | Mark Andrews <marka@isc.org> | 2008-01-23 22:49:54 +0000 |
| commit | b8c0eda0e58fe679396a540004c34798412db499 (patch) | |
| tree | 73e5fe35b34f545e4ebd3700ea56ea566951762c /includes | |
| parent | 4cafb815437c88938502ad45393a2be70f448511 (diff) | |
| download | isc-dhcp-b8c0eda0e58fe679396a540004c34798412db499.tar.gz | |
DHCP now builds under AIX
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/dhcpd.h | 1 | ||||
| -rw-r--r-- | includes/netinet/if_ether.h | 5 | ||||
| -rw-r--r-- | includes/osdep.h | 3 |
3 files changed, 9 insertions, 0 deletions
diff --git a/includes/dhcpd.h b/includes/dhcpd.h index 62f8915c..9b02f105 100644 --- a/includes/dhcpd.h +++ b/includes/dhcpd.h @@ -57,6 +57,7 @@ #include <time.h> #include <net/if.h> +#undef FDDI #include <net/route.h> #include <net/if_arp.h> #if HAVE_NET_IF_DL_H diff --git a/includes/netinet/if_ether.h b/includes/netinet/if_ether.h index e53b4c7f..8de80235 100644 --- a/includes/netinet/if_ether.h +++ b/includes/netinet/if_ether.h @@ -35,6 +35,9 @@ * @(#)if_ether.h 8.1 (Berkeley) 6/10/93 */ +#ifndef netinet_if_ether_h +#define netinet_if_ether_h + /* * Ethernet address - 6 octets * this is only used by the ethers(3) functions. @@ -59,3 +62,5 @@ struct isc_ether_header { #define ETHERTYPE_ARP 0x0806 /* address resolution protocol */ #define ETHER_HEADER_SIZE (ETHER_ADDR_LEN * 2 + sizeof (u_int16_t)) + +#endif diff --git a/includes/osdep.h b/includes/osdep.h index 6e1db70e..3cba9424 100644 --- a/includes/osdep.h +++ b/includes/osdep.h @@ -278,6 +278,9 @@ typedef uint32_t u_int32_t; #if !defined (SOCKLEN_T) # define SOCKLEN_T socklen_t +#elif defined(_AIX) +#undef SOCKLEN_T +#define SOCKLEN_T socklen_t #endif #if !defined (STDERR_FILENO) |