convert _FOO_SOURCE -> __FOO_VISIBLE in machine. OK deraadt@

4 files changed, 24 insertions, 26 deletions

diff --git a/sys/arch/mips64/include/limits.h b/sys/arch/mips64/include/limits.h
index 5564a841993..c240c41d71b 100644
--- a/sys/arch/mips64/include/limits.h
+++ b/sys/arch/mips64/include/limits.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: limits.h,v 1.2 2005/08/07 07:29:44 miod Exp $	*/
+/*	$OpenBSD: limits.h,v 1.3 2005/12/14 21:46:31 millert Exp $	*/
 
 /*
  * Copyright (c) 1988, 1993
@@ -34,6 +34,8 @@
 #ifndef _MIPS_LIMITS_H_
 #define _MIPS_LIMITS_H_
 
+#include <sys/cdefs.h>
+
 #define	CHAR_BIT	8		/* number of bits in a char */
 #define	MB_LEN_MAX	6		/* Allow 31 bit UTF2 */
 
@@ -62,15 +64,16 @@
 #define	INT_MAX		0x7fffffff	/* max value for an int */
 #define	INT_MIN		(-0x7fffffff-1)	/* min value for an int */
 
-#if !defined(_ANSI_SOURCE)
+#define	UID_MAX		UINT_MAX	/* max value for a uid_t */
+#define	GID_MAX		UINT_MAX	/* max value for a gid_t */
+
+#if __POSIX_VISIBLE || __XPG_VISIBLE
 #define SIZE_MAX	ULONG_MAX	/* max value for a size_t */
 #define	SSIZE_MAX	LONG_MAX	/* max value for a ssize_t */
+#endif
 
-#if !defined(_POSIX_SOURCE) && !defined(_XOPEN_SOURCE)
-#define	SIZE_T_MAX	ULONG_MAX	/* max value for a size_t */
-
-#define	UID_MAX		UINT_MAX	/* max value for a uid_t */
-#define	GID_MAX		UINT_MAX	/* max value for a gid_t */
+#if __BSD_VISIBLE
+#define	SIZE_T_MAX	ULONG_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 */
@@ -78,17 +81,6 @@
 #define	QUAD_MAX	((quad_t)(UQUAD_MAX >> 1))
 #define	QUAD_MIN	(-QUAD_MAX-1)	/* min value for a quad_t */
 
-#endif /* !_POSIX_SOURCE && !_XOPEN_SOURCE */
-#endif /* !_ANSI_SOURCE */
-
-#if (!defined(_ANSI_SOURCE)&&!defined(_POSIX_SOURCE)) || defined(_XOPEN_SOURCE)
-#define DBL_DIG		15
-#define DBL_MAX		1.797693134862316E+308
-#define DBL_MIN		2.225073858507201E-308
-
-#define FLT_DIG		6
-#define FLT_MAX		3.40282347E+38F
-#define FLT_MIN		1.17549435E-38F
-#endif
+#endif /* __BSD_VISIBLE */
 
 #endif /* !_MIPS_LIMITS_H_ */
diff --git a/sys/arch/mips64/include/signal.h b/sys/arch/mips64/include/signal.h
index 4e2319f5de5..613772567f1 100644
--- a/sys/arch/mips64/include/signal.h
+++ b/sys/arch/mips64/include/signal.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: signal.h,v 1.5 2005/11/29 02:26:49 deraadt Exp $	*/
+/*	$OpenBSD: signal.h,v 1.6 2005/12/14 21:46:31 millert Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -37,6 +37,8 @@
 #ifndef _MIPS_SIGNAL_H_
 #define _MIPS_SIGNAL_H_
 
+#include <sys/cdefs.h>
+
 #if !defined(__LANGUAGE_ASSEMBLY)
 #include <sys/types.h>
 
@@ -45,8 +47,7 @@
  */
 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
@@ -66,7 +67,7 @@ struct	sigcontext {
 	long	sc_fpc_eir;	/* floating point exception instruction reg */
 	long	xxx[8];		/* XXX reserved */
 };
-#endif	/* !_ANSI_SOURCE */
+#endif	/* __BSD_VISIBLE */
 
 #else /* __LANGUAGE_ASSEMBLY */
 #define SC_ONSTACK	(0 * REGSZ)
diff --git a/sys/arch/mips64/include/stdarg.h b/sys/arch/mips64/include/stdarg.h
index b721da144cc..1a4c0f18978 100644
--- a/sys/arch/mips64/include/stdarg.h
+++ b/sys/arch/mips64/include/stdarg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: stdarg.h,v 1.2 2005/08/07 07:29:44 miod Exp $	*/
+/*	$OpenBSD: stdarg.h,v 1.3 2005/12/14 21:46:31 millert Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993
@@ -34,6 +34,7 @@
 #ifndef _MIPS_STDARG_H_
 #define	_MIPS_STDARG_H_
 
+#include <sys/cdefs.h>
 #include <machine/ansi.h>
 
 typedef _BSD_VA_LIST_	va_list;
@@ -242,6 +243,8 @@ void va_end (__gnuc_va_list);		/* Defined in libgcc.a */
 
 /* Copy __gnuc_va_list into another variable of this type.  */
 #define __va_copy(dest, src) (dest) = (src)
+#if __ISO_C_VISIBLE >= 1999
 #define va_copy __va_copy
+#endif
 
 #endif /* !_MIPS_STDARG_H_ */
diff --git a/sys/arch/mips64/include/types.h b/sys/arch/mips64/include/types.h
index 31c1d839e49..7f81b5dbc2d 100644
--- a/sys/arch/mips64/include/types.h
+++ b/sys/arch/mips64/include/types.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: types.h,v 1.7 2005/08/07 07:29:44 miod Exp $	*/
+/*	$OpenBSD: types.h,v 1.8 2005/12/14 21:46:31 millert Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993
@@ -47,10 +47,12 @@
 
 #include <sys/cdefs.h>
 
+#if __BSD_VISIBLE
 typedef unsigned long	vaddr_t;
 typedef unsigned long	paddr_t;
 typedef unsigned long	vsize_t;
 typedef unsigned long	psize_t;
+#endif
 
 /*
  * Basic integral types.  Omit the typedef if
@@ -81,7 +83,7 @@ typedef int32_t		       register_t;
 typedef int32_t		     f_register_t;
 #endif
 
-#if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE)
+#if defined(_KERNEL)
 typedef struct label_t {
 	register_t val[14];
 } label_t;