convert _FOO_SOURCE -> __FOO_VISIBLE in machine. OK deraadt@

4 files changed, 25 insertions, 17 deletions

diff --git a/sys/arch/hppa64/include/limits.h b/sys/arch/hppa64/include/limits.h
index bc4736a98e1..b9e88daa4ae 100644
--- a/sys/arch/hppa64/include/limits.h
+++ b/sys/arch/hppa64/include/limits.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: limits.h,v 1.1 2005/04/01 10:40:48 mickey Exp $	*/
+/*	$OpenBSD: limits.h,v 1.2 2005/12/14 21:46:30 millert Exp $	*/
 
 /*
  * Copyright (c) 1988, 1993
@@ -34,14 +34,17 @@
 #ifndef _MACHINE_LIMITS_H_
 #define _MACHINE_LIMITS_H_
 
+#include <sys/cdefs.h>
+
 #define	MB_LEN_MAX	32		/* Allow 31 bit UTF2 */
 
-#if !defined(_ANSI_SOURCE)
-#define	SIZE_MAX	ULONG_MAX	/* max value for a size_t */
-#define	SSIZE_MAX	LONG_MAX	/* max value for a ssize_t */
+#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)
-#define	SIZE_T_MAX	ULONG_MAX	/* max value for a size_t */
+#if __BSD_VISIBLE
+#define	SIZE_T_MAX	UINT_MAX	/* max value for a size_t (historic) */
 
 /* GCC requires that quad constants be written as expressions. */
 #define	UQUAD_MAX	((u_quad_t)0-1)	/* max value for a uquad_t */
@@ -49,7 +52,6 @@
 #define	QUAD_MAX	((quad_t)(UQUAD_MAX >> 1))
 #define	QUAD_MIN	(-QUAD_MAX-1)	/* min value for a quad_t */
 
-#endif /* !_POSIX_SOURCE */
-#endif /* !_ANSI_SOURCE */
+#endif /* __BSD_VISIBLE */
 
 #endif /* _MACHINE_LIMITS_H_ */
diff --git a/sys/arch/hppa64/include/signal.h b/sys/arch/hppa64/include/signal.h
index c09fcd73ea1..7d382945c97 100644
--- a/sys/arch/hppa64/include/signal.h
+++ b/sys/arch/hppa64/include/signal.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: signal.h,v 1.1 2005/04/01 10:40:48 mickey Exp $	*/
+/*	$OpenBSD: signal.h,v 1.2 2005/12/14 21:46:30 millert Exp $	*/
 
 /* 
  * Copyright (c) 1994, The University of Utah and
@@ -26,13 +26,15 @@
 #ifndef	_HPPA64_SIGNAL_H_
 #define	_HPPA64_SIGNAL_H_
 
+#include <sys/cdefs.h>
+
 /*
  * Machine-dependent signal definitions
  */
 
 typedef int sig_atomic_t;
 
-#ifndef _ANSI_SOURCE
+#if __BSD_VISIBLE
 #include <machine/trap.h>
 
 /*
@@ -53,5 +55,5 @@ struct	sigcontext {
 	unsigned long	sc_regs[32];
 	unsigned long	sc_fpregs[64];
 };
-#endif  /* !_ANSI_SOURCE */
+#endif  /* __BSD_VISIBLE */
 #endif  /* !_HPPA64_SIGNAL_H_ */
diff --git a/sys/arch/hppa64/include/stdarg.h b/sys/arch/hppa64/include/stdarg.h
index 5d0e1a203d9..bd488cba729 100644
--- a/sys/arch/hppa64/include/stdarg.h
+++ b/sys/arch/hppa64/include/stdarg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: stdarg.h,v 1.1 2005/04/01 10:40:48 mickey Exp $	*/
+/*	$OpenBSD: stdarg.h,v 1.2 2005/12/14 21:46:30 millert Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993
@@ -34,6 +34,8 @@
 #ifndef _MACHINE_STDARG_H_
 #define	_MACHINE_STDARG_H_
 
+#include <sys/cdefs.h>
+
 typedef double *va_list;
 
 #ifdef __GNUC__
@@ -50,9 +52,7 @@ typedef double *va_list;
 	                             (sizeof(type) > 4 ? ~0x7 : ~0x3))),\
 	     (*((type *) (void *) ((char *)ap + ((8 - sizeof(type)) % 4))))))
 
-#if !defined(_ANSI_SOURCE) && \
-    (!defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE) || \
-     defined(_ISOC99_SOURCE) || (__STDC_VERSION__ - 0) >= 199901L)
+#if __ISO_C_VISIBLE >= 1999
 #define va_copy(dest, src) \
 	((dest) = (src))
 #endif
diff --git a/sys/arch/hppa64/include/types.h b/sys/arch/hppa64/include/types.h
index b098db4f83c..0fd1f814a8f 100644
--- a/sys/arch/hppa64/include/types.h
+++ b/sys/arch/hppa64/include/types.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: types.h,v 1.1 2005/04/01 10:40:48 mickey Exp $	*/
+/*	$OpenBSD: types.h,v 1.2 2005/12/14 21:46:30 millert Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -34,7 +34,9 @@
 #ifndef	_MACHINE_TYPES_H_
 #define	_MACHINE_TYPES_H_
 
-#if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE)
+#include <sys/cdefs.h>
+
+#if defined(_KERNEL)
 typedef struct label_t {
 	int	lbl_rp;
 	int	lbl_sp;
@@ -42,7 +44,9 @@ typedef struct label_t {
 	int	lbl_ss[1];
 	double	lbl_sf[10];	/* hp800:fr12-fr15, hp700:fr12-fr21 */
 } label_t;
+#endif
 
+#if __BSD_VISIBLE
 typedef	unsigned long		hppa_hpa_t;
 typedef	unsigned long		hppa_spa_t;
 typedef	unsigned int		pa_space_t;