diff options
author | Marc Espie <espie@cvs.openbsd.org> | 2004-01-03 14:08:55 +0000 |
---|---|---|
committer | Marc Espie <espie@cvs.openbsd.org> | 2004-01-03 14:08:55 +0000 |
commit | f8086ce091549315cd470bcea8c56fa4ee438f1b (patch) | |
tree | d72e268347fd3adc8cb53eaf4269e281dd46ab47 /sys/arch | |
parent | 31ec8d6d746e8bf365990ee271f1a77c3c1e3d0a (diff) |
put an mi wrapper around stdarg.h/varargs.h. gcc3 moved stdarg/varargs macros
to built-ins, so eventually we will have one version of these files.
Special adjustments for the kernel to cope: machine/stdarg.h -> sys/stdarg.h
and machine/ansi.h needs to have a _BSD_VA_LIST_ for syslog* prototypes.
okay millert@, drahn@, miod@.
Diffstat (limited to 'sys/arch')
-rw-r--r-- | sys/arch/alpha/include/ansi.h | 6 | ||||
-rw-r--r-- | sys/arch/hppa/include/ansi.h | 6 | ||||
-rw-r--r-- | sys/arch/i386/include/ansi.h | 6 | ||||
-rw-r--r-- | sys/arch/m68k/include/ansi.h | 6 | ||||
-rw-r--r-- | sys/arch/mvme88k/include/ansi.h | 8 | ||||
-rw-r--r-- | sys/arch/powerpc/include/ansi.h | 6 | ||||
-rw-r--r-- | sys/arch/sparc/include/ansi.h | 6 | ||||
-rw-r--r-- | sys/arch/sparc64/include/ansi.h | 6 | ||||
-rw-r--r-- | sys/arch/vax/include/ansi.h | 6 |
9 files changed, 46 insertions, 10 deletions
diff --git a/sys/arch/alpha/include/ansi.h b/sys/arch/alpha/include/ansi.h index 13755b90ffb..e460b0f6593 100644 --- a/sys/arch/alpha/include/ansi.h +++ b/sys/arch/alpha/include/ansi.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ansi.h,v 1.10 2003/06/02 23:27:43 millert Exp $ */ +/* $OpenBSD: ansi.h,v 1.11 2004/01/03 14:08:52 espie Exp $ */ /* $NetBSD: ansi.h,v 1.6 1996/11/15 22:38:45 jtc Exp $ */ /*- @@ -54,7 +54,11 @@ typedef struct { int offset; int pad; } __va_list; +#if defined(__GNUC__) && __GNUC__ >= 3 +#define _BSD_VA_LIST_ __builtin_va_list +#else #define _BSD_VA_LIST_ __va_list /* va_list */ +#endif #define _BSD_CLOCKID_T_ int #define _BSD_TIMER_T_ int diff --git a/sys/arch/hppa/include/ansi.h b/sys/arch/hppa/include/ansi.h index 571f7db9c4a..7c2e1ecd07a 100644 --- a/sys/arch/hppa/include/ansi.h +++ b/sys/arch/hppa/include/ansi.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ansi.h,v 1.5 2003/06/02 23:27:46 millert Exp $ */ +/* $OpenBSD: ansi.h,v 1.6 2004/01/03 14:08:52 espie Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -48,7 +48,11 @@ #define _BSD_SIZE_T_ unsigned int /* sizeof() */ #define _BSD_SSIZE_T_ int /* byte count or error */ #define _BSD_TIME_T_ int /* time() */ +#if defined(__GNUC__) && __GNUC__ >= 3 +#define _BSD_VA_LIST_ __builtin_va_list +#else #define _BSD_VA_LIST_ double * /* va_list */ +#endif #define _BSD_CLOCKID_T_ int #define _BSD_TIMER_T_ int diff --git a/sys/arch/i386/include/ansi.h b/sys/arch/i386/include/ansi.h index e8d2306844f..a996423ba2a 100644 --- a/sys/arch/i386/include/ansi.h +++ b/sys/arch/i386/include/ansi.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ansi.h,v 1.8 2003/06/02 23:27:47 millert Exp $ */ +/* $OpenBSD: ansi.h,v 1.9 2004/01/03 14:08:52 espie Exp $ */ /* $NetBSD: ansi.h,v 1.7 1996/11/15 22:38:50 jtc Exp $ */ /*- @@ -49,7 +49,11 @@ #define _BSD_SIZE_T_ unsigned int /* sizeof() */ #define _BSD_SSIZE_T_ int /* byte count or error */ #define _BSD_TIME_T_ int /* time() */ +#if defined(__GNUC__) && __GNUC__ >= 3 +#define _BSD_VA_LIST_ __builtin_va_list +#else #define _BSD_VA_LIST_ char * /* va_list */ +#endif #define _BSD_CLOCKID_T_ int #define _BSD_TIMER_T_ int diff --git a/sys/arch/m68k/include/ansi.h b/sys/arch/m68k/include/ansi.h index 3f2ab4068c2..64051d75435 100644 --- a/sys/arch/m68k/include/ansi.h +++ b/sys/arch/m68k/include/ansi.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ansi.h,v 1.7 2003/06/02 23:27:48 millert Exp $ */ +/* $OpenBSD: ansi.h,v 1.8 2004/01/03 14:08:52 espie Exp $ */ /* $NetBSD: ansi.h,v 1.7 1996/11/15 22:38:52 jtc Exp $ */ /*- @@ -49,7 +49,11 @@ #define _BSD_SIZE_T_ unsigned int /* sizeof() */ #define _BSD_SSIZE_T_ int /* byte count or error */ #define _BSD_TIME_T_ int /* time() */ +#if defined(__GNUC__) && __GNUC__ >= 3 +#define _BSD_VA_LIST_ __builtin_va_list +#else #define _BSD_VA_LIST_ char * /* va_list */ +#endif #define _BSD_CLOCKID_T_ int #define _BSD_TIMER_T_ int diff --git a/sys/arch/mvme88k/include/ansi.h b/sys/arch/mvme88k/include/ansi.h index 809c570acf5..2dc85b42359 100644 --- a/sys/arch/mvme88k/include/ansi.h +++ b/sys/arch/mvme88k/include/ansi.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ansi.h,v 1.16 2003/10/11 22:08:57 miod Exp $ */ +/* $OpenBSD: ansi.h,v 1.17 2004/01/03 14:08:53 espie Exp $ */ /*- * Copyright (c) 1990, 1993 * The Regents of the University of California. All rights reserved. @@ -48,7 +48,11 @@ #define _BSD_SSIZE_T_ int /* byte count or error */ #define _BSD_TIME_T_ int /* time() */ struct __va_list_tag; -#define _BSD_VA_LIST_ struct __va_list_tag * /* va_list */ +#if defined(__GNUC__) && __GNUC__ >= 3 +#define _BSD_VA_LIST_ __builtin_va_list +#else +#define _BSD_VA_LIST_ struct __va_list_tag * /* va_list */ +#endif #define _BSD_CLOCKID_T_ int #define _BSD_TIMER_T_ int diff --git a/sys/arch/powerpc/include/ansi.h b/sys/arch/powerpc/include/ansi.h index 0fb5a29288a..8808d0210f7 100644 --- a/sys/arch/powerpc/include/ansi.h +++ b/sys/arch/powerpc/include/ansi.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ansi.h,v 1.11 2003/08/10 00:14:12 miod Exp $ */ +/* $OpenBSD: ansi.h,v 1.12 2004/01/03 14:08:53 espie Exp $ */ /* $NetBSD: ansi.h,v 1.2 1996/11/15 22:38:57 jtc Exp $ */ /*- @@ -50,7 +50,11 @@ #define _BSD_SSIZE_T_ int /* byte count or error */ #define _BSD_TIME_T_ int /* time() */ struct __va_list_tag; +#if defined(__GNUC__) && __GNUC__ >= 3 +#define _BSD_VA_LIST_ __builtin_va_list +#else #define _BSD_VA_LIST_ struct __va_list_tag * /* va_list */ +#endif #define _BSD_CLOCKID_T_ int #define _BSD_TIMER_T_ int diff --git a/sys/arch/sparc/include/ansi.h b/sys/arch/sparc/include/ansi.h index a460cb30c1e..081b8fc5e3d 100644 --- a/sys/arch/sparc/include/ansi.h +++ b/sys/arch/sparc/include/ansi.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ansi.h,v 1.8 2003/06/02 23:27:54 millert Exp $ */ +/* $OpenBSD: ansi.h,v 1.9 2004/01/03 14:08:53 espie Exp $ */ /* $NetBSD: ansi.h,v 1.6 1996/11/15 22:38:59 jtc Exp $ */ /*- @@ -49,7 +49,11 @@ #define _BSD_SIZE_T_ unsigned int /* sizeof() */ #define _BSD_SSIZE_T_ int /* byte count or error */ #define _BSD_TIME_T_ int /* time() */ +#if defined(__GNUC__) && __GNUC__ >= 3 +#define _BSD_VA_LIST_ __builtin_va_list +#else #define _BSD_VA_LIST_ char * /* va_list */ +#endif #define _BSD_CLOCKID_T_ int #define _BSD_TIMER_T_ int diff --git a/sys/arch/sparc64/include/ansi.h b/sys/arch/sparc64/include/ansi.h index 2c7380ccb86..b77b84a94e1 100644 --- a/sys/arch/sparc64/include/ansi.h +++ b/sys/arch/sparc64/include/ansi.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ansi.h,v 1.3 2003/06/02 23:27:56 millert Exp $ */ +/* $OpenBSD: ansi.h,v 1.4 2004/01/03 14:08:53 espie Exp $ */ /* $NetBSD: ansi.h,v 1.7 2001/01/03 10:09:04 takemura Exp $ */ /*- @@ -51,7 +51,11 @@ #define _BSD_SIZE_T_ unsigned long /* sizeof() */ #define _BSD_SSIZE_T_ long /* byte count or error */ #define _BSD_TIME_T_ int /* time() */ +#if defined(__GNUC__) && __GNUC__ >= 3 +#define _BSD_VA_LIST_ __builtin_va_list +#else #define _BSD_VA_LIST_ char * /* va_list */ +#endif #define _BSD_CLOCKID_T_ int /* clockid_t */ #define _BSD_TIMER_T_ int /* timer_t */ diff --git a/sys/arch/vax/include/ansi.h b/sys/arch/vax/include/ansi.h index b45ca1ded65..57d0e3ea77b 100644 --- a/sys/arch/vax/include/ansi.h +++ b/sys/arch/vax/include/ansi.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ansi.h,v 1.9 2003/06/02 23:27:57 millert Exp $ */ +/* $OpenBSD: ansi.h,v 1.10 2004/01/03 14:08:53 espie Exp $ */ /* $NetBSD: ansi.h,v 1.7 1998/04/27 17:39:11 kleink Exp $ */ /*- @@ -51,7 +51,11 @@ #define _BSD_SIZE_T_ unsigned int /* sizeof() */ #define _BSD_SSIZE_T_ int /* byte count or error */ #define _BSD_TIME_T_ int /* time() */ +#if defined(__GNUC__) && __GNUC__ >= 3 +#define _BSD_VA_LIST_ __builtin_va_list +#else #define _BSD_VA_LIST_ char * /* va_list */ +#endif #define _BSD_WCHAR_T_ int /* wchar_t */ #define _BSD_WINT_T_ int /* wint_t */ #define _BSD_CLOCKID_T_ int /* clockid_t */ |