From dae6ecb6b9bdb7c9fde78d8dadc455fb3a8f029a Mon Sep 17 00:00:00 2001 From: tedu Date: Tue, 16 Dec 2014 21:40:05 +0000 Subject: [PATCH] don't include lock.h by default. poisons namespace. ok deraadt --- sys/arch/i386/include/cpu.h | 3 +-- sys/arch/i386/include/pic.h | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/sys/arch/i386/include/cpu.h b/sys/arch/i386/include/cpu.h index 196b348b9cd..36aec9df34f 100644 --- a/sys/arch/i386/include/cpu.h +++ b/sys/arch/i386/include/cpu.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.h,v 1.136 2014/12/02 18:13:10 tedu Exp $ */ +/* $OpenBSD: cpu.h,v 1.137 2014/12/16 21:40:05 tedu Exp $ */ /* $NetBSD: cpu.h,v 1.35 1996/05/05 19:29:26 christos Exp $ */ /*- @@ -64,7 +64,6 @@ #define clockframe intrframe #include -#include /* will also get LOCKDEBUG */ #include #include diff --git a/sys/arch/i386/include/pic.h b/sys/arch/i386/include/pic.h index ce95cc48e45..3e5b2d9e0a8 100644 --- a/sys/arch/i386/include/pic.h +++ b/sys/arch/i386/include/pic.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pic.h,v 1.1 2009/08/13 13:24:48 kettenis Exp $ */ +/* $OpenBSD: pic.h,v 1.2 2014/12/16 21:40:05 tedu Exp $ */ /* $NetBSD: pic.h,v 1.1 2003/02/26 21:26:11 fvdl Exp $ */ #ifndef _X86_PIC_H @@ -6,7 +6,6 @@ #include #include -#include struct cpu_info; -- 2.20.1