Date: Wed, 8 Feb 2006 02:17:00 GMT From: Robert Watson <rwatson@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 91360 for review Message-ID: <200602080217.k182H0x5037901@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=91360 Change 91360 by rwatson@rwatson_peppercorn on 2006/02/08 02:16:41 Darwin's sys/sysctl.h causes a nested include of the host sys/audit.h, which contains duplicate type definitions to bsm/libbsm.h. We need our own definitions, so for now, use a #define to tell the compiler we already have all the necessary bits from sys/audit.h on Apple platforms. Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#15 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#15 (text+ko) ==== @@ -26,9 +26,13 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#14 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#15 $ */ +#ifdef __APPLE__ +#define _SYS_AUDIT_H /* Prevent include of sys/audit.h. */ +#endf + #include <sys/param.h> #include <sys/stat.h> #include <sys/sysctl.h>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200602080217.k182H0x5037901>