From owner-svn-src-all@FreeBSD.ORG Fri Jun 11 21:46:46 2010 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 33D141065677; Fri, 11 Jun 2010 21:46:46 +0000 (UTC) (envelope-from cperciva@FreeBSD.org) Received: from svn.freebsd.org (unknown [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 22FB68FC18; Fri, 11 Jun 2010 21:46:46 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o5BLkkrR098927; Fri, 11 Jun 2010 21:46:46 GMT (envelope-from cperciva@svn.freebsd.org) Received: (from cperciva@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o5BLkkor098925; Fri, 11 Jun 2010 21:46:46 GMT (envelope-from cperciva@svn.freebsd.org) Message-Id: <201006112146.o5BLkkor098925@svn.freebsd.org> From: Colin Percival Date: Fri, 11 Jun 2010 21:46:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r209072 - head/usr.sbin/sysinstall X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Jun 2010 21:46:46 -0000 Author: cperciva Date: Fri Jun 11 21:46:45 2010 New Revision: 209072 URL: http://svn.freebsd.org/changeset/base/209072 Log: Clean up code by removing pre-C99 struct hack preprocessor magic. Approved by: randi (maintainer) Modified: head/usr.sbin/sysinstall/sysinstall.h Modified: head/usr.sbin/sysinstall/sysinstall.h ============================================================================== --- head/usr.sbin/sysinstall/sysinstall.h Fri Jun 11 21:35:19 2010 (r209071) +++ head/usr.sbin/sysinstall/sysinstall.h Fri Jun 11 21:46:45 2010 (r209072) @@ -228,13 +228,7 @@ typedef struct _dmenu { char *prompt; /* Our prompt */ char *helpline; /* Line of help at bottom */ char *helpfile; /* Help file for "F1" */ -#if (__STDC_VERSION__ >= 199901L) || (__GNUC__ >= 3) dialogMenuItem items[]; /* Array of menu items */ -#elif __GNUC__ - dialogMenuItem items[0]; /* Array of menu items */ -#else -#error "Create hack for C89 and K&R compilers." -#endif } DMenu; /* An rc.conf variable */