details: https://anonhg.NetBSD.org/src/rev/fc1fab30d951
branches: trunk
changeset: 566152:fc1fab30d951
user: fredb <fredb%NetBSD.org@localhost>
date: Thu Apr 29 04:18:27 2004 +0000
description:
Protect against multiple inclusion. Lets "kdump" and "ktrace" build again
on mac68k.
diffstat:
sys/arch/mac68k/include/grfioctl.h | 7 ++++++-
sys/arch/mac68k/include/iteioctl.h | 6 +++++-
2 files changed, 11 insertions(+), 2 deletions(-)
diffs (49 lines):
diff -r 21125f231b3f -r fc1fab30d951 sys/arch/mac68k/include/grfioctl.h
--- a/sys/arch/mac68k/include/grfioctl.h Thu Apr 29 03:54:46 2004 +0000
+++ b/sys/arch/mac68k/include/grfioctl.h Thu Apr 29 04:18:27 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: grfioctl.h,v 1.10 2003/08/07 16:28:20 agc Exp $ */
+/* $NetBSD: grfioctl.h,v 1.11 2004/04/29 04:18:27 fredb Exp $ */
/*
* Copyright (c) 1990 The Regents of the University of California.
@@ -76,6 +76,9 @@
* @(#)grfioctl.h 7.2 (Berkeley) 11/4/90
*/
+#ifndef _MAC68K_GRFIOCTL_H_
+#define _MAC68K_GRFIOCTL_H_
+
struct grfmode {
u_int8_t mode_id; /* Identifier for mode */
u_int8_t pad0;
@@ -136,3 +139,5 @@
int gd_pad[6]; /* for future expansion */
};
#endif /* GRF_COMPAT || (NGRF > 0) */
+
+#endif /* _MAC68K_GRFIOCTL_H_ */
diff -r 21125f231b3f -r fc1fab30d951 sys/arch/mac68k/include/iteioctl.h
--- a/sys/arch/mac68k/include/iteioctl.h Thu Apr 29 03:54:46 2004 +0000
+++ b/sys/arch/mac68k/include/iteioctl.h Thu Apr 29 04:18:27 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: iteioctl.h,v 1.2 1997/10/13 14:22:39 lukem Exp $ */
+/* $NetBSD: iteioctl.h,v 1.3 2004/04/29 04:18:27 fredb Exp $ */
/*-
* Copyright (C) 1994 Allen K. Briggs, Chris P. Caputo,
@@ -34,6 +34,8 @@
*
*/
+#ifndef _MAC68K_ITEIOCTL_H_
+#define _MAC68K_ITEIOCTL_H_
#include <sys/ioctl.h>
@@ -48,3 +50,5 @@
#define ITEIOC_GETBELL _IOR('I', 128, struct bellparams)
#define ITEIOC_SETBELL _IOW('I', 129, struct bellparams)
#define ITEIOC_RINGBELL _IO('I', 130)
+
+#endif /* _MAC68K_ITEIOCTL_H_ */