Changeset 3716 for branches/libc-0.6/src/emx/include/386

Timestamp:

Mar 17, 2011, 6:38:29 PM (14 years ago)

Author:

bird

Message:

0.6: Backported r3715: 386/stdarg.h,sys/cdefs.h: Synced in bit from more recent FreeBSDs so that the stdarg.h macros will work with more recent GCC versions. Fixes #212.

File:

• branches/libc-0.6/src/emx/include/386/stdarg.h (modified) (4 diffs)

branches/libc-0.6/src/emx/include/386/stdarg.h

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * FreeBSD 5.1
+ * FreeBSD 9.0
  * @changed bird: EMXisms.
  */
@@ -38 +38 @@
  *
  *      @(#)stdarg.h    8.1 (Berkeley) 6/10/93
- * $FreeBSD: src/sys/i386/include/stdarg.h,v 1.18 2002/11/27 16:28:18 obrien Exp $
+ * $FreeBSD: src/sys/i386/include/stdarg.h,v 1.21 2006/09/21 01:37:02 kan Exp $
  */
 
@@ -53 +53 @@
 #endif
 
-#if defined(__GNUC__) && (__GNUC__ == 2 && __GNUC_MINOR__ > 95 || __GNUC__ >= 3)
+#ifdef __GNUCLIKE_BUILTIN_STDARG
 
 #define va_start(ap, last) \
-        __builtin_stdarg_start((ap), (last))
+        __builtin_va_start((ap), (last))
 
 #define va_arg(ap, type) \
@@ -69 +69 @@
         __builtin_va_end(ap)
 
-#else   /* ! __GNUC__ post GCC 2.95 */
+#else   /* !__GNUCLIKE_BUILTIN_STDARG */
 
 #define __va_size(type) \
         (((sizeof(type) + sizeof(int) - 1) / sizeof(int)) * sizeof(int))
 
-#ifdef __GNUC__
+#ifdef __GNUCLIKE_BUILTIN_NEXT_ARG
 #define va_start(ap, last) \
         ((ap) = (va_list)__builtin_next_arg(last))
-#else   /* non-GNU compiler */
+#else   /* !__GNUCLIKE_BUILTIN_NEXT_ARG */
 #define va_start(ap, last) \
         ((ap) = (va_list)&(last) + __va_size(last))
-#endif  /* __GNUC__ */
+#endif  /* __GNUCLIKE_BUILTIN_NEXT_ARG */
 
 #define va_arg(ap, type) \
         (*(type *)((ap) += __va_size(type), (ap) - __va_size(type)))
 
+#if __ISO_C_VISIBLE >= 1999
+#define va_copy(dest, src) \
+        ((dest) = (src))
+#endif
+
 #define va_end(ap)
 
-#endif /* __GNUC__ post GCC 2.95 */
+#endif /* __GNUCLIKE_BUILTIN_STDARG */
 
 #endif /* !_MACHINE_STDARG_H_ */
+