[src/trunk]: src/sys/sys ... aaand re-add lint compat. I still got it.

[pooka <pooka%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/6b31056c57cc
branches:  trunk
changeset: 780309:6b31056c57cc
user:      pooka <pooka%NetBSD.org@localhost>
date:      Thu Jul 19 22:46:41 2012 +0000

description:
... aaand re-add lint compat.  I still got it.

diffstat:

 sys/sys/stdarg.h |  9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diffs (31 lines):

diff -r fbb07b549884 -r 6b31056c57cc sys/sys/stdarg.h
--- a/sys/sys/stdarg.h  Thu Jul 19 22:34:54 2012 +0000
+++ b/sys/sys/stdarg.h  Thu Jul 19 22:46:41 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: stdarg.h,v 1.2 2012/07/19 22:34:54 pooka Exp $ */
+/*     $NetBSD: stdarg.h,v 1.3 2012/07/19 22:46:41 pooka Exp $ */
 
 /*-
  * Copyright (c) 1991, 1993
@@ -43,6 +43,9 @@
 #define        __builtin_va_arg(a, t)          ((a) ? (t) 0 : (t) 0)
 #define        __builtin_va_end(a)             /* nothing */
 #define        __builtin_va_copy(d, s)         ((d) = (s))
+#elif !(__GNUC_PREREQ__(4, 5) || \
+    (__GNUC_PREREQ__(4, 4) && __GNUC_PATCHLEVEL__ > 2))
+#define __builtin_va_start(ap, last)    __builtin_stdarg_start((ap), (last))
 #endif
 
 #ifndef __VA_LIST_DECLARED
@@ -50,11 +53,7 @@
 #define __VA_LIST_DECLARED
 #endif
 
-#if __GNUC_PREREQ__(4, 5) || (__GNUC_PREREQ__(4, 4) && __GNUC_PATCHLEVEL__ > 2)
 #define        va_start(ap, last)      __builtin_va_start((ap), (last))
-#else
-#define        va_start(ap, last)      __builtin_stdarg_start((ap), (last))
-#endif
 #define        va_arg                  __builtin_va_arg
 #define        va_end(ap)              __builtin_va_end(ap)
 #define        __va_copy(dest, src)    __builtin_va_copy((dest), (src))