summaryrefslogtreecommitdiffstats
path: root/sys/i386
diff options
context:
space:
mode:
authormike <mike@FreeBSD.org>2002-10-06 22:01:07 +0000
committermike <mike@FreeBSD.org>2002-10-06 22:01:07 +0000
commit11edf68c645f68e33d4e6b998494665a80ffa3da (patch)
treea74fb1396ec54dd583afef671267d3002a8580b8 /sys/i386
parent662e742e451c19aa5764d21ff9ebb2efee6500e3 (diff)
downloadFreeBSD-src-11edf68c645f68e33d4e6b998494665a80ffa3da.zip
FreeBSD-src-11edf68c645f68e33d4e6b998494665a80ffa3da.tar.gz
o Add conditionals to allow va_list to be defined in other headers.
o Standardize on _MACHINE_STDARG_H_ to allow multiple header includes. o Restrict the definition of va_copy() to C99 environments.
Diffstat (limited to 'sys/i386')
-rw-r--r--sys/i386/include/stdarg.h14
1 files changed, 10 insertions, 4 deletions
diff --git a/sys/i386/include/stdarg.h b/sys/i386/include/stdarg.h
index 3ce2f37..246a991 100644
--- a/sys/i386/include/stdarg.h
+++ b/sys/i386/include/stdarg.h
@@ -35,12 +35,16 @@
* $FreeBSD$
*/
-#ifndef _STDARG_H_
-#define _STDARG_H_
+#ifndef _MACHINE_STDARG_H_
+#define _MACHINE_STDARG_H_
+#include <sys/cdefs.h>
#include <sys/_types.h>
-typedef __va_list va_list;
+#ifndef _VA_LIST_DECLARED
+#define _VA_LIST_DECLARED
+typedef __va_list va_list;
+#endif
#if defined(__GNUC__) && (__GNUC__ == 2 && __GNUC_MINOR__ > 95 || __GNUC__ >= 3)
@@ -50,8 +54,10 @@ typedef __va_list va_list;
#define va_arg(ap, type) \
__builtin_va_arg((ap), type)
+#if __ISO_C_VISIBLE >= 1999
#define va_copy(dest, src) \
__builtin_va_copy((dest), (src))
+#endif
#define va_end(ap) \
__builtin_va_end(ap)
@@ -77,4 +83,4 @@ typedef __va_list va_list;
#endif /* __GNUC__ post GCC 2.95 */
-#endif /* !_STDARG_H_ */
+#endif /* !_MACHINE_STDARG_H_ */
OpenPOWER on IntegriCloud