summaryrefslogtreecommitdiff
path: root/sys/arch/i386/include/stdarg.h
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>1995-12-30 08:48:24 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>1995-12-30 08:48:24 +0000
commitda10fa74772694cff97087eb39c83a311ba6eadc (patch)
treec2f7eb8915196cb758b2aabeb7ed60b0df6ffcd8 /sys/arch/i386/include/stdarg.h
parentb9aee3c44417b6bdbb038f048472d3b1f05aaa8c (diff)
from netbsd: support more gcc versions
Diffstat (limited to 'sys/arch/i386/include/stdarg.h')
-rw-r--r--sys/arch/i386/include/stdarg.h15
1 files changed, 5 insertions, 10 deletions
diff --git a/sys/arch/i386/include/stdarg.h b/sys/arch/i386/include/stdarg.h
index be8a86d925b..ddf7c81c083 100644
--- a/sys/arch/i386/include/stdarg.h
+++ b/sys/arch/i386/include/stdarg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: stdarg.h,v 1.9 1995/03/28 18:17:21 jtc Exp $ */
+/* $NetBSD: stdarg.h,v 1.12 1995/12/25 23:15:31 mycroft Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -42,19 +42,14 @@
typedef _BSD_VA_LIST_ va_list;
-#define __va_promote(type) \
- (((sizeof(type) + sizeof(int) - 1) / sizeof(int)) * sizeof(int))
+#define __va_size(type) \
+ (((sizeof(type) + sizeof(long) - 1) / sizeof(long)) * sizeof(long))
#define va_start(ap, last) \
- (ap = ((char *)&(last) + __va_promote(last)))
+ ((ap) = (va_list)&(last) + __va_size(last))
-#ifdef _KERNEL
#define va_arg(ap, type) \
- ((type *)(ap += sizeof(type)))[-1]
-#else
-#define va_arg(ap, type) \
- ((type *)(ap += __va_promote(type), ap - __va_promote(type)))[0]
-#endif
+ (*(type *)((ap) += __va_size(type), (ap) - __va_size(type)))
#define va_end(ap) ((void)0)