convert _FOO_SOURCE -> __FOO_VISIBLE in machine. OK deraadt@

4 files changed, 19 insertions, 14 deletions

diff --git a/sys/arch/vax/include/limits.h b/sys/arch/vax/include/limits.h
index 9abebfc755f..3c6342d283c 100644
--- a/sys/arch/vax/include/limits.h
+++ b/sys/arch/vax/include/limits.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: limits.h,v 1.11 2003/06/02 23:27:57 millert Exp $	*/
+/*	$OpenBSD: limits.h,v 1.12 2005/12/14 21:46:31 millert Exp $	*/
 /*	$NetBSD: limits.h,v 1.9 2000/03/07 19:33:01 kleink Exp $	*/
 
 /*
@@ -35,20 +35,22 @@
 #ifndef _MACHINE_LIMITS_H_
 #define _MACHINE_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 /* _MACHINE_LIMITS_H_ */
diff --git a/sys/arch/vax/include/signal.h b/sys/arch/vax/include/signal.h
index d3a7f35d7ee..9e668b79021 100644
--- a/sys/arch/vax/include/signal.h
+++ b/sys/arch/vax/include/signal.h
@@ -1,4 +1,4 @@
-/*      $OpenBSD: signal.h,v 1.3 2003/06/02 23:27:57 millert Exp $   */
+/*      $OpenBSD: signal.h,v 1.4 2005/12/14 21:46:31 millert Exp $   */
 /*      $NetBSD: signal.h,v 1.4 1995/01/10 19:01:52 jtc Exp $   */
 
 /*
@@ -37,9 +37,11 @@
 #ifndef _VAX_SIGNAL_H_
 #define _VAX_SIGNAL_H_
 
+#include <sys/cdefs.h>
+
 typedef int sig_atomic_t;
 
-#ifndef _ANSI_SOURCE
+#if __BSD_VISIBLE
 /*
  * Information pushed on stack when a signal is delivered.
  * This is used by the kernel to restore state following
@@ -57,5 +59,5 @@ struct	sigcontext {
 	int	sc_ps;			/* psl to restore */
 };
 
-#endif	/* !_ANSI_SOURCE */
+#endif	/* __BSD_VISIBLE */
 #endif	/* !_VAX_SIGNAL_H_ */
diff --git a/sys/arch/vax/include/stdarg.h b/sys/arch/vax/include/stdarg.h
index d77db2fba36..2ebf9dc7f26 100644
--- a/sys/arch/vax/include/stdarg.h
+++ b/sys/arch/vax/include/stdarg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: stdarg.h,v 1.6 2003/06/02 23:27:57 millert Exp $	*/
+/*	$OpenBSD: stdarg.h,v 1.7 2005/12/14 21:46:31 millert Exp $	*/
 /*	$NetBSD: stdarg.h,v 1.11 1999/05/03 16:30:34 christos Exp $	*/
 
 /*-
@@ -35,6 +35,7 @@
 #ifndef _VAX_STDARG_H_
 #define	_VAX_STDARG_H_
 
+#include <sys/cdefs.h>
 #include <machine/ansi.h>
 
 typedef _BSD_VA_LIST_	va_list;
@@ -52,9 +53,7 @@ typedef _BSD_VA_LIST_	va_list;
 #define	va_arg(ap, type) \
 	(*(type *)(void *)((ap) += __va_size(type), (ap) - __va_size(type)))
 
-#if !defined(_ANSI_SOURCE) && \
-    (!defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE) || \
-     defined(_ISOC99_SOURCE) || (__STDC_VERSION__ - 0) >= 199901L)
+#if __BSD_VISIBLE
 #define va_copy(dest, src) \
 	((dest) = (src))
 #endif
diff --git a/sys/arch/vax/include/types.h b/sys/arch/vax/include/types.h
index c6c9d65e4b7..f6dc8d29f5b 100644
--- a/sys/arch/vax/include/types.h
+++ b/sys/arch/vax/include/types.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: types.h,v 1.15 2005/11/06 22:21:30 miod Exp $	*/
+/*	$OpenBSD: types.h,v 1.16 2005/12/14 21:46:31 millert Exp $	*/
 /*	$NetBSD: types.h,v 1.14 1998/08/13 02:10:49 eeh Exp $	*/
 
 /*-
@@ -43,10 +43,12 @@ typedef struct label_t {
 } label_t;
 #endif
 
+#if __BSD_VISIBLE
 typedef unsigned long	paddr_t;
 typedef	unsigned long	psize_t;
 typedef unsigned long	vaddr_t;
 typedef	unsigned long	vsize_t;
+#endif
 
 /*
  * Basic integral types.  Omit the typedef if