From 983b35b281fa9981acfdf23cd5813897720d1445 Mon Sep 17 00:00:00 2001
From: Tim Rice <tim@multitalents.net>
Date: Sun, 24 Sep 2006 12:08:59 -0700
Subject: [PATCH] 20060924  - (tim) [configure.ac] Remove CFLAGS hack for
 UnixWare 1.x/2.x (added    to rev 1.308) to work around broken gcc 2.x header
 file.

---
 ChangeLog    | 6 +++++-
 configure.ac | 5 ++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 78abba7d1..4ac8dc4fd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+20060924
+ - (tim) [configure.ac] Remove CFLAGS hack for UnixWare 1.x/2.x (added
+   to rev 1.308) to work around broken gcc 2.x header file.
+
 20060923
  - (dtucker) [configure.ac] Bug #1234: Put opensc libs into $LIBS rather than
    $LDFLAGS.  Patch from vapier at gentoo org.
@@ -5478,4 +5482,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.4557 2006/09/23 06:25:19 dtucker Exp $
+$Id: ChangeLog,v 1.4558 2006/09/24 19:08:59 tim Exp $
diff --git a/configure.ac b/configure.ac
index 01e84104d..cfcd0272d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.366 2006/09/23 06:25:20 dtucker Exp $
+# $Id: configure.ac,v 1.367 2006/09/24 19:08:59 tim Exp $
 #
 # Copyright (c) 1999-2004 Damien Miller
 #
@@ -15,7 +15,7 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org)
-AC_REVISION($Revision: 1.366 $)
+AC_REVISION($Revision: 1.367 $)
 AC_CONFIG_SRCDIR([ssh.c])
 
 AC_CONFIG_HEADER(config.h)
@@ -514,7 +514,6 @@ mips-sony-bsd|mips-sony-newsos4)
 	;;
 # UnixWare 1.x, UnixWare 2.x, and others based on code from Univel.
 *-*-sysv4.2*)
-	CFLAGS="$CFLAGS -Dva_list=_VA_LIST"
 	AC_DEFINE(USE_PIPES)
 	AC_DEFINE(SETEUID_BREAKS_SETUID)
 	AC_DEFINE(BROKEN_SETREUID)