$OpenBSD: patch-lib_getarg_c,v 1.1 2003/12/28 18:42:46 espie Exp $
--- lib/getarg.c.orig	2003-12-28 19:23:47.000000000 +0100
+++ lib/getarg.c	2003-12-28 19:29:06.000000000 +0100
@@ -105,10 +105,12 @@
 #include <alloc.h>
 #endif /* __MSDOS__ */
 
+#ifdef STDC_HEADERS
+    #include <stdarg.h>
+#else
 #ifdef HAVE_VARARGS_H
     #include <varargs.h>
-#elif defined(STDC_HEADERS)
-    #include <stdarg.h>
+#endif
 #endif
 
 #ifndef __MSDOS__
@@ -160,7 +162,7 @@ static char *MyMalloc(unsigned size);
 * Routine to access the	command	line argument and interpret them:	   *
 * Return ARG_OK (0) is case of succesfull parsing, error code else...	   *
 ***************************************************************************/
-#ifdef HAVE_VARARGS_H
+#if defined(HAVE_VARARGS_H) && !defined(STDC_HEADERS)
 int GAGetArgs(int va_alist, ...)
 {
     va_list ap;