From feaed6c57ee2f40ae2c9569d65cd06788c98608c Mon Sep 17 00:00:00 2001 From: John Baldwin Date: Wed, 30 Jul 2008 21:01:51 +0000 Subject: [PATCH] Trim some noise from some #ifdef's. This had leaked into the compat32 support for bpf(4) due to hacks in the Y! tree for a truss32 binary (since superseded by native support for 32-bit binaries in truss itself). MFC after: 1 week --- sys/net/if.h | 2 +- sys/sys/sockio.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/net/if.h b/sys/net/if.h index 95566fb9f941..216c5b4ad168 100644 --- a/sys/net/if.h +++ b/sys/net/if.h @@ -374,7 +374,7 @@ struct ifconf { #define ifc_req ifc_ifcu.ifcu_req /* array of structures returned */ }; -#if defined (__amd64__) || defined (COMPAT_32BIT) +#if defined (__amd64__) struct ifconf32 { int ifc_len; /* size of associated buffer */ union { diff --git a/sys/sys/sockio.h b/sys/sys/sockio.h index 18acd3f5307d..b97509b26291 100644 --- a/sys/sys/sockio.h +++ b/sys/sys/sockio.h @@ -62,7 +62,7 @@ #define SIOCSIFBRDADDR _IOW('i', 19, struct ifreq) /* set broadcast addr */ #define OSIOCGIFCONF _IOWR('i', 20, struct ifconf) /* get ifnet list */ #define SIOCGIFCONF _IOWR('i', 36, struct ifconf) /* get ifnet list */ -#if defined (__amd64__) || defined (COMPAT_32BIT) +#if defined (__amd64__) #define SIOCGIFCONF32 _IOWR('i', 36, struct ifconf32) /* get ifnet list */ #endif #define OSIOCGIFNETMASK _IOWR('i', 21, struct ifreq) /* get net addr mask */