From owner-svn-src-all@FreeBSD.ORG Sun Jun 13 11:27:45 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 55EDE1065672; Sun, 13 Jun 2010 11:27:45 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 44BD48FC16; Sun, 13 Jun 2010 11:27:45 +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 o5DBRj3Z011309; Sun, 13 Jun 2010 11:27:45 GMT (envelope-from ed@svn.freebsd.org) Received: (from ed@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o5DBRjuJ011307; Sun, 13 Jun 2010 11:27:45 GMT (envelope-from ed@svn.freebsd.org) Message-Id: <201006131127.o5DBRjuJ011307@svn.freebsd.org> From: Ed Schouten Date: Sun, 13 Jun 2010 11:27:45 +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: r209123 - 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: Sun, 13 Jun 2010 11:27:45 -0000 Author: ed Date: Sun Jun 13 11:27:44 2010 New Revision: 209123 URL: http://svn.freebsd.org/changeset/base/209123 Log: Unbreak the build on less common architectures. Submitted by: Andreas Tobler Modified: head/usr.sbin/sysinstall/install.c Modified: head/usr.sbin/sysinstall/install.c ============================================================================== --- head/usr.sbin/sysinstall/install.c Sun Jun 13 10:58:50 2010 (r209122) +++ head/usr.sbin/sysinstall/install.c Sun Jun 13 11:27:44 2010 (r209123) @@ -628,8 +628,11 @@ installExpress(dialogMenuItem *self) int installStandard(dialogMenuItem *self) { - int i, tries = 0; + int i; +#ifdef WITH_SLICES + int tries = 0; Device **devs; +#endif variable_set2(SYSTEM_STATE, "standard", 0); dialog_clear_norefresh(); @@ -874,7 +877,9 @@ installConfigure(void) int installFixupBase(dialogMenuItem *self) { +#if defined(__i386__) || defined(__amd64__) FILE *fp; +#endif #ifdef __ia64__ const char *efi_mntpt; #endif