diff options
Diffstat (limited to 'sys/arch/sparc64/include')
-rw-r--r-- | sys/arch/sparc64/include/limits.h | 14 | ||||
-rw-r--r-- | sys/arch/sparc64/include/signal.h | 15 | ||||
-rw-r--r-- | sys/arch/sparc64/include/stdarg.h | 7 | ||||
-rw-r--r-- | sys/arch/sparc64/include/types.h | 6 |
4 files changed, 22 insertions, 20 deletions
diff --git a/sys/arch/sparc64/include/limits.h b/sys/arch/sparc64/include/limits.h index 1d608265066..7020923f411 100644 --- a/sys/arch/sparc64/include/limits.h +++ b/sys/arch/sparc64/include/limits.h @@ -1,4 +1,4 @@ -/* $OpenBSD: limits.h,v 1.7 2003/06/15 04:35:54 brad Exp $ */ +/* $OpenBSD: limits.h,v 1.8 2005/12/14 21:46:31 millert Exp $ */ /* $NetBSD: limits.h,v 1.8 2000/08/08 22:31:14 tshiozak Exp $ */ /* @@ -35,14 +35,17 @@ #ifndef _MACHINE_LIMITS_H_ #define _MACHINE_LIMITS_H_ +#include <sys/cdefs.h> + #define MB_LEN_MAX 32 /* no multibyte characters */ -#if !defined(_ANSI_SOURCE) +#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_C_SOURCE) && !defined(_XOPEN_SOURCE) -#define SIZE_T_MAX ULONG_MAX /* max value for a size_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 */ @@ -50,7 +53,6 @@ #define QUAD_MAX ((quad_t)(UQUAD_MAX >> 1)) #define QUAD_MIN (-QUAD_MAX-1) /* min value for a quad_t */ -#endif /* !_POSIX_C_SOURCE && !_XOPEN_SOURCE */ -#endif /* !_ANSI_SOURCE */ +#endif /* __BSD_VISIBLE */ #endif /* _MACHINE_LIMITS_H_ */ diff --git a/sys/arch/sparc64/include/signal.h b/sys/arch/sparc64/include/signal.h index f72c8509952..ddab3c9d73e 100644 --- a/sys/arch/sparc64/include/signal.h +++ b/sys/arch/sparc64/include/signal.h @@ -1,4 +1,4 @@ -/* $OpenBSD: signal.h,v 1.5 2003/06/02 23:27:56 millert Exp $ */ +/* $OpenBSD: signal.h,v 1.6 2005/12/14 21:46:31 millert Exp $ */ /* $NetBSD: signal.h,v 1.10 2001/05/09 19:50:49 kleink Exp $ */ /* @@ -41,15 +41,16 @@ * @(#)signal.h 8.1 (Berkeley) 6/11/93 */ -#ifndef _SPARC_SIGNAL_H_ -#define _SPARC_SIGNAL_H_ +#ifndef _SPARC64_SIGNAL_H_ +#define _SPARC64_SIGNAL_H_ + +#include <sys/cdefs.h> #ifndef _LOCORE typedef int sig_atomic_t; #endif -#if !defined(_ANSI_SOURCE) && !defined(_POSIX_C_SOURCE) && \ - !defined(_XOPEN_SOURCE) +#if __BSD_VISIBLE #ifndef _LOCORE /* @@ -88,5 +89,5 @@ struct sigcontext { #define FPE_FLTOPERR_TRAP 0xd0 /* operand error */ #define FPE_FLTOVF_TRAP 0xd4 /* overflow */ -#endif /* !_ANSI_SOURCE && !_POSIX_C_SOURCE && !_XOPEN_SOURCE */ -#endif /* !_SPARC_SIGNAL_H_ */ +#endif /* __BSD_VISIBLE */ +#endif /* !_SPARC64_SIGNAL_H_ */ diff --git a/sys/arch/sparc64/include/stdarg.h b/sys/arch/sparc64/include/stdarg.h index 3687adbdbc5..58e56a19799 100644 --- a/sys/arch/sparc64/include/stdarg.h +++ b/sys/arch/sparc64/include/stdarg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: stdarg.h,v 1.3 2003/06/02 23:27:56 millert Exp $ */ +/* $OpenBSD: stdarg.h,v 1.4 2005/12/14 21:46:31 millert Exp $ */ /* $NetBSD: stdarg.h,v 1.11 2000/07/23 21:36:56 mycroft Exp $ */ /* @@ -44,6 +44,7 @@ #ifndef _SPARC64_STDARG_H_ #define _SPARC64_STDARG_H_ +#include <sys/cdefs.h> #include <machine/ansi.h> #ifdef __lint__ @@ -57,9 +58,7 @@ typedef _BSD_VA_LIST_ va_list; #define va_start(ap, last) \ (__builtin_next_arg(last), (ap) = (va_list)__builtin_saveregs()) -#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/sparc64/include/types.h b/sys/arch/sparc64/include/types.h index 9952385e6b4..9096d3c27bd 100644 --- a/sys/arch/sparc64/include/types.h +++ b/sys/arch/sparc64/include/types.h @@ -1,4 +1,4 @@ -/* $OpenBSD: types.h,v 1.9 2004/11/26 21:23:06 miod Exp $ */ +/* $OpenBSD: types.h,v 1.10 2005/12/14 21:46:31 millert Exp $ */ /* $NetBSD: types.h,v 1.17 2001/05/12 22:42:07 kleink Exp $ */ /* @@ -47,7 +47,7 @@ #include <sys/cdefs.h> #include <machine/int_types.h> -#if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE) +#if defined(_KERNEL) typedef struct label_t { int val[2]; } label_t; @@ -58,7 +58,7 @@ typedef unsigned long int register_t; typedef unsigned int register32_t; typedef unsigned long int register64_t; -#if !defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE) +#if __BSD_VISIBLE typedef unsigned long int vaddr_t; typedef vaddr_t vsize_t; typedef unsigned long int paddr_t; |