Module Name: src
Committed By: christos
Date: Mon Feb 24 16:57:57 UTC 2014
Modified Files:
src/sys/arch/arm/include: ansi.h aout_machdep.h apmvar.h int_types.h
limits.h proc.h vfpreg.h
Log Message:
consistency in include protection
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/arm/include/ansi.h \
src/sys/arch/arm/include/proc.h
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/include/aout_machdep.h
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/include/apmvar.h
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arm/include/int_types.h
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/arm/include/limits.h
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/include/vfpreg.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/include/ansi.h
diff -u src/sys/arch/arm/include/ansi.h:1.16 src/sys/arch/arm/include/ansi.h:1.17
--- src/sys/arch/arm/include/ansi.h:1.16 Tue Jan 28 19:18:32 2014
+++ src/sys/arch/arm/include/ansi.h Mon Feb 24 11:57:57 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ansi.h,v 1.16 2014/01/29 00:18:32 matt Exp $ */
+/* $NetBSD: ansi.h,v 1.17 2014/02/24 16:57:57 christos Exp $ */
/*
* Copyright (c) 1990, 1993
@@ -31,8 +31,8 @@
* from: @(#)ansi.h 8.2 (Berkeley) 1/4/94
*/
-#ifndef _ARM_ANSI_H_
-#define _ARM_ANSI_H_
+#ifndef _ARM_ANSI_H_
+#define _ARM_ANSI_H_
#include <sys/cdefs.h>
Index: src/sys/arch/arm/include/proc.h
diff -u src/sys/arch/arm/include/proc.h:1.16 src/sys/arch/arm/include/proc.h:1.17
--- src/sys/arch/arm/include/proc.h:1.16 Tue Jan 28 19:42:15 2014
+++ src/sys/arch/arm/include/proc.h Mon Feb 24 11:57:57 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: proc.h,v 1.16 2014/01/29 00:42:15 matt Exp $ */
+/* $NetBSD: proc.h,v 1.17 2014/02/24 16:57:57 christos Exp $ */
/*
* Copyright (c) 1994 Mark Brinicombe.
@@ -32,8 +32,8 @@
* SUCH DAMAGE.
*/
-#ifndef _ARM_PROC_H_
-#define _ARM_PROC_H_
+#ifndef _ARM_PROC_H_
+#define _ARM_PROC_H_
/*
* Machine-dependent part of the proc structure for arm.
Index: src/sys/arch/arm/include/aout_machdep.h
diff -u src/sys/arch/arm/include/aout_machdep.h:1.6 src/sys/arch/arm/include/aout_machdep.h:1.7
--- src/sys/arch/arm/include/aout_machdep.h:1.6 Tue Jan 28 19:42:15 2014
+++ src/sys/arch/arm/include/aout_machdep.h Mon Feb 24 11:57:57 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: aout_machdep.h,v 1.6 2014/01/29 00:42:15 matt Exp $ */
+/* $NetBSD: aout_machdep.h,v 1.7 2014/02/24 16:57:57 christos Exp $ */
/*
* Copyright (c) 1994-1996 Mark Brinicombe.
@@ -32,8 +32,8 @@
* SUCH DAMAGE.
*/
-#ifndef _ARM_AOUT_MACHDEP_H_
-#define _ARM_AOUT_MACHDEP_H_
+#ifndef _ARM_AOUT_MACHDEP_H_
+#define _ARM_AOUT_MACHDEP_H_
#define AOUT_LDPGSZ 4096
Index: src/sys/arch/arm/include/apmvar.h
diff -u src/sys/arch/arm/include/apmvar.h:1.1 src/sys/arch/arm/include/apmvar.h:1.2
--- src/sys/arch/arm/include/apmvar.h:1.1 Wed May 1 23:56:40 2013
+++ src/sys/arch/arm/include/apmvar.h Mon Feb 24 11:57:57 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: apmvar.h,v 1.1 2013/05/02 03:56:40 matt Exp $ */
+/* $NetBSD: apmvar.h,v 1.2 2014/02/24 16:57:57 christos Exp $ */
/*-
* Copyright (c) 1995 The NetBSD Foundation, Inc.
@@ -25,10 +25,10 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef __ZAURUS_APMVAR_H__
-#define __ZAURUS_APMVAR_H__
+#ifndef _ARM_APMVAR_H_
+#define _ARM_APMVAR_H_
#include <dev/apm/apmbios.h>
#include <dev/apm/apmio.h>
-#endif /* __ZAURUS_APMVAR_H__ */
+#endif /* _ARM_APMVAR_H_ */
Index: src/sys/arch/arm/include/int_types.h
diff -u src/sys/arch/arm/include/int_types.h:1.13 src/sys/arch/arm/include/int_types.h:1.14
--- src/sys/arch/arm/include/int_types.h:1.13 Fri Jan 31 06:37:13 2014
+++ src/sys/arch/arm/include/int_types.h Mon Feb 24 11:57:57 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: int_types.h,v 1.13 2014/01/31 11:37:13 matt Exp $ */
+/* $NetBSD: int_types.h,v 1.14 2014/02/24 16:57:57 christos Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -29,8 +29,8 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef _ARM_INT_TYPES_H_
-#define _ARM_INT_TYPES_H_
+#ifndef _ARM_INT_TYPES_H_
+#define _ARM_INT_TYPES_H_
#include <sys/cdefs.h>
Index: src/sys/arch/arm/include/limits.h
diff -u src/sys/arch/arm/include/limits.h:1.17 src/sys/arch/arm/include/limits.h:1.18
--- src/sys/arch/arm/include/limits.h:1.17 Tue Jan 28 20:40:35 2014
+++ src/sys/arch/arm/include/limits.h Mon Feb 24 11:57:57 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: limits.h,v 1.17 2014/01/29 01:40:35 matt Exp $ */
+/* $NetBSD: limits.h,v 1.18 2014/02/24 16:57:57 christos Exp $ */
/*
* Copyright (c) 1988 The Regents of the University of California.
@@ -31,8 +31,8 @@
* from: @(#)limits.h 7.2 (Berkeley) 6/28/90
*/
-#ifndef _ARM_LIMITS_H_
-#define _ARM_LIMITS_H_
+#ifndef _ARM_LIMITS_H_
+#define _ARM_LIMITS_H_
#include <sys/featuretest.h>
Index: src/sys/arch/arm/include/vfpreg.h
diff -u src/sys/arch/arm/include/vfpreg.h:1.11 src/sys/arch/arm/include/vfpreg.h:1.12
--- src/sys/arch/arm/include/vfpreg.h:1.11 Thu Jan 23 12:44:13 2014
+++ src/sys/arch/arm/include/vfpreg.h Mon Feb 24 11:57:57 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: vfpreg.h,v 1.11 2014/01/23 17:44:13 skrll Exp $ */
+/* $NetBSD: vfpreg.h,v 1.12 2014/02/24 16:57:57 christos Exp $ */
/*
* Copyright (c) 2008 ARM Ltd
@@ -29,10 +29,10 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef _VFPREG_H
-#define _VFPREG_H
+#ifndef _ARM_VFPREG_H_
+#define _ARM_VFPREG_H_
-/* FPSID regsiter */
+/* FPSID register */
#define VFP_FPSID_IMP_MSK 0xff000000 /* Implementer */
#define VFP_FPSID_IMP_ARM 0x41000000 /* Implementer: ARM */
@@ -110,4 +110,4 @@
#define VFP_FPSCR_DZC 0x00000002 /* DivByZero Cumulative Flag */
#define VFP_FPSCR_IOC 0x00000001 /* Invalid Operation Cumulative Flag */
-#endif /* _VFPREG_H */
+#endif /* _ARM_VFPREG_H_ */
