4 files changed, 19 insertions, 17 deletions
diff --git a/sys/arch/arm/include/limits.h b/sys/arch/arm/include/limits.h
index 44c99876b4f..3479577b598 100644
--- a/sys/arch/arm/include/limits.h
+++ b/sys/arch/arm/include/limits.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: limits.h,v 1.1 2004/02/01 05:09:49 drahn Exp $	*/
+/*	$OpenBSD: limits.h,v 1.2 2005/12/14 21:46:30 millert Exp $	*/
 /*	$NetBSD: limits.h,v 1.4 2003/04/28 23:16:18 bjh21 Exp $	*/
 
 /*
@@ -35,20 +35,22 @@
 #ifndef	_ARM32_LIMITS_H_
 #define	_ARM32_LIMITS_H_
 
+#include <sys/cdefs.h>
+
 #define	MB_LEN_MAX	1		/* no multibyte characters */
 
-#if !defined(_ANSI_SOURCE)
+#if __POSIX_VISIBLE || __XPG_VISIBLE
 #define	SIZE_MAX	UINT_MAX	/* max value for a size_t */
 #define	SSIZE_MAX	INT_MAX		/* max value for a ssize_t */
+#endif
 
-#if !defined(_POSIX_SOURCE) && !defined(_XOPEN_SOURCE)
-#define	SIZE_T_MAX	UINT_MAX	/* max value for a size_t */
+#if __BSD_VISIBLE
+#define	SIZE_T_MAX	UINT_MAX	/* max value for a size_t (historic) */
 
 #define	UQUAD_MAX	0xffffffffffffffffULL		/* max unsigned quad */
 #define	QUAD_MAX	0x7fffffffffffffffLL		/* max signed quad */
 #define	QUAD_MIN	(-0x7fffffffffffffffLL-1)	/* min signed quad */
 
-#endif /* !_POSIX_SOURCE && !_XOPEN_SOURCE */
-#endif /* !_ANSI_SOURCE */
+#endif /* __BSD_VISIBLE */
 
 #endif	/* _ARM32_LIMITS_H_ */
diff --git a/sys/arch/arm/include/signal.h b/sys/arch/arm/include/signal.h
index d0d5122166d..121b03d4120 100644
--- a/sys/arch/arm/include/signal.h
+++ b/sys/arch/arm/include/signal.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: signal.h,v 1.1 2004/02/01 05:09:49 drahn Exp $	*/
+/*	$OpenBSD: signal.h,v 1.2 2005/12/14 21:46:30 millert Exp $	*/
 /*	$NetBSD: signal.h,v 1.5 2003/10/18 17:57:21 briggs Exp $	*/
 
 /*
@@ -47,13 +47,15 @@
 #ifndef _ARM32_SIGNAL_H_
 #define _ARM32_SIGNAL_H_
 
+#include <sys/cdefs.h>
+
 #ifndef _LOCORE
 typedef int sig_atomic_t;
 #endif
 
 #define __HAVE_SIGINFO
 
-
+#if __BSD_VISIBLE
 #ifndef _LOCORE
 /*
  * Information pushed on stack when a signal is delivered.
@@ -129,6 +131,5 @@ struct sigcontext {
 #define SIG_CODE_SEGV_ADDR_MASK	SIG_CODE_BUS_ADDR_MASK
 #define SIG_CODE_SEGV_TYPE_MASK	SIG_CODE_BUS_TYPE_MASK
 
-#endif	/* !_ARM_SIGNAL_H_ */
-
-/* End of signal.h */
+#endif /* __BSD_VISIBLE */
+#endif	/* !_ARM32_SIGNAL_H_ */
diff --git a/sys/arch/arm/include/stdarg.h b/sys/arch/arm/include/stdarg.h
index 4203558ad70..4af3e313bb8 100644
--- a/sys/arch/arm/include/stdarg.h
+++ b/sys/arch/arm/include/stdarg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: stdarg.h,v 1.3 2005/11/24 20:49:44 deraadt Exp $ */
+/*	$OpenBSD: stdarg.h,v 1.4 2005/12/14 21:46:30 millert Exp $ */
 /*	$NetBSD: stdarg.h,v 1.7 2003/08/07 16:26:53 agc Exp $	*/
 
 /*
@@ -35,6 +35,7 @@
 #ifndef _ARM32_STDARG_H_
 #define	_ARM32_STDARG_H_
 
+#include <sys/cdefs.h>
 #include <machine/ansi.h>
 
 typedef _BSD_VA_LIST_	va_list;
@@ -51,9 +52,7 @@ typedef _BSD_VA_LIST_	va_list;
 #define	va_end			__builtin_va_end
 #define	__va_copy(dest, src)	__builtin_va_copy((dest), (src))
 
-#if !defined(_ANSI_SOURCE) &&						\
-    (defined(_ISOC99_SOURCE) || (__STDC_VERSION__ - 0) >= 199901L ||	\
-     defined(_NETBSD_SOURCE))
+#if __ISO_C_VISIBLE >= 1999
 #define	va_copy(dest, src)	__va_copy((dest), (src))
 #endif
 
diff --git a/sys/arch/arm/include/types.h b/sys/arch/arm/include/types.h
index 38fb6218272..d4d1cb614ee 100644
--- a/sys/arch/arm/include/types.h
+++ b/sys/arch/arm/include/types.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: types.h,v 1.3 2004/11/26 21:23:04 miod Exp $	*/
+/*	$OpenBSD: types.h,v 1.4 2005/12/14 21:46:30 millert Exp $	*/
 /*	$NetBSD: types.h,v 1.4 2002/02/28 03:17:25 simonb Exp $	*/
 
 /*
@@ -53,7 +53,7 @@ typedef struct label_t {	/* Used by setjmp & longjmp */
 #endif
          
 /* NB: This should probably be if defined(_KERNEL) */
-#if !defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)
+#if __BSD_VISIBLE
 typedef	unsigned long	vm_offset_t;
 typedef	unsigned long	vm_size_t;