Replaced the file gcc-stdarg.h with a modified <stdarg.h> from NetBSD-1.6.2

that allows xen12 to be compiled on NetBSD-1.6.2. Approved by wiz.

2 files changed, 69 insertions, 2 deletions

diff --git a/sysutils/xen12/Makefile b/sysutils/xen12/Makefile
index a2f93e45ddd..60413a5a3dd 100644
--- a/sysutils/xen12/Makefile
+++ b/sysutils/xen12/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/12/03 15:15:10 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2005/03/14 16:06:46 rillig Exp $
 #
 
 DISTNAME=		xeno-1.2-src-040418
@@ -32,7 +32,7 @@ SITES_xen12-com2-support-040522.diff=ftp://ftp.NetBSD.org/pub/NetBSD/arch/xen/mi
 .endif
 
 post-extract:
-	@${CP} ${FILESDIR}/gcc333-stdarg.h ${WRKSRC}/include/stdarg.h
+	@${CP} ${FILESDIR}/stdarg.h ${WRKSRC}/include/stdarg.h
 	@${CP} ${WRKDIR}/xen12-addtl-ide-dma-040522/drivers/ide/* ${WRKSRC}/drivers/ide/
 
 do-install:
diff --git a/sysutils/xen12/files/stdarg.h b/sysutils/xen12/files/stdarg.h
new file mode 100644
index 00000000000..4c65de165cd
--- /dev/null
+++ b/sysutils/xen12/files/stdarg.h
@@ -0,0 +1,67 @@
+/*	$NetBSD: stdarg.h,v 1.1 2005/03/14 16:06:46 rillig Exp $	*/
+/*	NetBSD: stdarg.h,v 1.19 2000/05/05 00:21:48 thorpej Exp $	*/
+
+/*-
+ * Copyright (c) 1991, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *	@(#)stdarg.h	8.1 (Berkeley) 6/10/93
+ */
+
+#ifndef _I386_STDARG_H_
+#define	_I386_STDARG_H_
+
+#if __GNUC__ > 2 || __GNUC__ == 2 && __GNUC_MINOR__ >= 96
+#define	_BSD_VA_LIST_		__builtin_va_list /* GCC built-in type */
+#else
+#define	_BSD_VA_LIST_		char *		/* va_list */
+#endif
+
+typedef _BSD_VA_LIST_	va_list;
+
+#if __GNUC__ > 2 || __GNUC__ == 2 && __GNUC_MINOR__ >= 96
+#define	va_start(ap, last)	__builtin_stdarg_start((ap), (last))
+#define	va_arg			__builtin_va_arg
+#define	va_end			__builtin_va_end
+#else
+#define	__va_size(type) \
+	(((sizeof(type) + sizeof(long) - 1) / sizeof(long)) * sizeof(long))
+
+#define	va_start(ap, last) \
+	((ap) = (va_list)__builtin_next_arg(last))
+
+#define	va_arg(ap, type) \
+	(*(type *)(void *)((ap) += __va_size(type), (ap) - __va_size(type)))
+
+#define	va_end(ap)	
+#endif
+
+#endif /* !_I386_STDARG_H_ */