Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add some mulitple include protection.

Browse Source 
Include kbdmap.h from iteioctl.h so that kdump compiles, otherwise
the size of struct kbdmap as used in various ioctl defines is unknown.
This commit is contained in:
he 2004-05-18 20:08:51 +00:00
parent 5e2026a163
commit 09b074c177
5 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/arch/atari/dev/grfioctl.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: grfioctl.h,v 1.4 2003/08/07 16:26:59 agc Exp $ */
/* $NetBSD: grfioctl.h,v 1.5 2004/05/18 20:08:51 he Exp $ */
/*
* Copyright (c) 1990 The Regents of the University of California.
@ -76,6 +76,8 @@
* @(#)grfioctl.h 7.2 (Berkeley) 11/4/90
*/
#ifndef _MACHINE_GRFIOCTL_H_
#define _MACHINE_GRFIOCTL_H_
/* these are changeable values, encapsulated in their own structure, so
no the whole thing has to be copied when setting parameters. */
@ -250,3 +252,4 @@ struct grf_bitblt {
#define GRFIOCBITBLT _IOR('G', 57, struct grf_bitblt)
#endif /* _MACHINE_GRFIOCTL_H_ */

8
sys/arch/atari/dev/iteioctl.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: iteioctl.h,v 1.3 2003/08/07 16:27:01 agc Exp $ */
/* $NetBSD: iteioctl.h,v 1.4 2004/05/18 20:08:51 he Exp $ */
/*
* Copyright (c) 1990 The Regents of the University of California.
@ -76,6 +76,11 @@
* @(#)iteioctl.h 7.2 (Berkeley) 11/4/90
*/
#ifndef _MACHINE_ITEIOCTL_H_
#define _MACHINE_ITEIOCTL_H_
#include <machine/kbdmap.h>
struct itewinsize {
int x; /* leftedge offset to the right */
int y; /* topedge offset down */
@ -115,3 +120,4 @@ struct iterepeat {
#define ITESWITCH _IOW('Z',0x69, int) /* XXX */
#endif /* _MACHINE_ITEIOCTL_H_ */

7
sys/arch/atari/dev/kbdmap.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: kbdmap.h,v 1.4 1997/01/10 21:24:27 leo Exp $ */
/* $NetBSD: kbdmap.h,v 1.5 2004/05/18 20:08:51 he Exp $ */
/*
* Copyright (c) 1993 Markus Wild
@ -30,6 +30,9 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef _MACHINE_KBDMAP_H_
#define _MACHINE_KBDMAP_H_
#define NUL 0
#define SOH 1
#define STX 2
@ -143,3 +146,5 @@ struct kbdmap {
extern struct kbdmap ascii_kbdmap;
extern unsigned char acctable[KBD_NUM_ACC][64];
#endif
#endif /* _MACHINE_KBDMAP_H_ */

7
sys/arch/atari/dev/kbdreg.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: kbdreg.h,v 1.3 2003/08/07 16:27:02 agc Exp $ */
/* $NetBSD: kbdreg.h,v 1.4 2004/05/18 20:08:51 he Exp $ */
/*
* Copyright (c) 1992, 1993
@ -42,6 +42,9 @@
* from: Header: kbio.h,v 1.4 92/11/26 01:16:32 torek Exp (LBL)
*/
#ifndef _MACHINE_KBDREG_H_
#define _MACHINE_KBDREG_H_
struct kbdbell {
u_int volume; /* volume of bell (0-64) */
u_int pitch; /* pitch of bell (10-20000) */
@ -55,3 +58,5 @@ struct kbdbell {
#define KIOCRINGBELL _IOW('k', 15, struct kbdbell) /* ring bell */
#define TR_UNTRANS_EVENT 3
#endif /* _MACHINE_KBDREG_H_ */

7
sys/arch/atari/dev/vuid_event.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: vuid_event.h,v 1.2 2003/08/07 16:27:02 agc Exp $ */
/* $NetBSD: vuid_event.h,v 1.3 2004/05/18 20:08:51 he Exp $ */
/*
* Copyright (c) 1992, 1993
@ -42,6 +42,9 @@
* from: Header: vuid_event.h,v 1.4 92/11/26 01:20:27 torek Exp (LBL)
*/
#ifndef _MACHINE_VUID_EVENT_H_
#define _MACHINE_VUID_EVENT_H_
/*
* The following is a minimal emulation of Sun's `Firm_event' structures
* and related operations necessary to make X11 happy (i.e., make it
@ -81,3 +84,5 @@ typedef struct firm_event {
#define VUIDSFORMAT _IOW('v', 1, int)
#define VUIDGFORMAT _IOR('v', 2, int)
#define VUID_FIRM_EVENT 1 /* the only format we support */
#endif /* _MACHINE_VUID_EVENT_H_ */