From owner-freebsd-emulation@FreeBSD.ORG Thu Jun 3 19:10:26 2010 Return-Path: Delivered-To: freebsd-emulation@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B770F106566B for ; Thu, 3 Jun 2010 19:10:26 +0000 (UTC) (envelope-from imb@protected-networks.net) Received: from sarah.protected-networks.net (sarah.protected-networks.net [IPv6:2001:470:1f07:4e1::1]) by mx1.freebsd.org (Postfix) with ESMTP id 7F9368FC16 for ; Thu, 3 Jun 2010 19:10:26 +0000 (UTC) Received: from toshi.auburn.protected-networks.net (toshi.auburn.protected-networks.net [IPv6:2001:470:1f07:4e1::4]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client CN "Iain Butler", Issuer "RSA Class 2 Personal CA" (verified OK)) (Authenticated sender: imb) by sarah.protected-networks.net (Postfix) with ESMTPSA id B5CB46104 for ; Thu, 3 Jun 2010 15:10:25 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=protected-networks.net; s=200705; t=1275592225; bh=JqD3Af5WTCQXmQpJFDWkftHHd+2fwoSE8C5CA5hDZlM=; h=Message-ID:Date:From:MIME-Version:To:Subject:References: In-Reply-To:Content-Type:Content-Transfer-Encoding; b=B4B5psSEj2e6p+ANccGcrK8OfUDOHKzy8srwO4fxJsG/a0jh5lWnBqx2DrTSK3iMh aCz0x2EIjvUwm5xqyTM9Db82FfZW8EIb1JpfqaKYSOJElX2v9UgdhWZasVl+htF DomainKey-Signature: a=rsa-sha1; s=200509; d=protected-networks.net; c=nofws; q=dns; h=message-id:date:from:user-agent:mime-version:to:subject: references:in-reply-to:x-enigmail-version:openpgp:content-type:content-transfer-encoding; b=U4a1QPkJUtytU/6dgSqG1RaI2qr0VYpQNrsM4y8+FYb7dY9TEBeQEVPKCLGa+Z0Wx LvZiU4Ll0zxOCHQk+8dVbPNC3apGTDSMoOASp/uw5AiH90fQX92yI8X7XCKGP14 Message-ID: <4C07FE20.2030308@protected-networks.net> Date: Thu, 03 Jun 2010 15:10:24 -0400 From: Michael Butler User-Agent: Mozilla/5.0 (X11; U; FreeBSD i386; en-US; rv:1.9.1.9) Gecko/20100602 Thunderbird/3.0.4 MIME-Version: 1.0 To: freebsd-emulation@freebsd.org References: <4C07FCC4.7010901@protected-networks.net> <4C07FD1B.3060402@protected-networks.net> In-Reply-To: <4C07FD1B.3060402@protected-networks.net> X-Enigmail-Version: 1.0.1 OpenPGP: id=0442D492 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Subject: Re: VirtualBox 3.2.2 on -current X-BeenThere: freebsd-emulation@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Development of Emulators of other operating systems List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Jun 2010 19:10:26 -0000 On 06/03/10 15:06, Michael Butler wrote: > On 06/03/10 15:04, Michael Butler wrote: >> Two patches are required to get VirtualBox 3.2.2 to compile on -current >> SVN r208788 (and, likely, before). > >> Unofficial fixes for both attached, > > Hmmpff! *** include/iprt/string.h~ Tue Apr 27 16:23:42 2010 --- include/iprt/string.h Thu Jun 3 14:56:23 2010 *************** *** 60,66 **** #if (defined(RT_OS_DARWIN) && defined(KERNEL)) \ || (defined(RT_OS_FREEBSD) && defined(_KERNEL)) RT_C_DECLS_BEGIN ! void *memchr(const void *pv, int ch, size_t cb); char *strpbrk(const char *pszStr, const char *pszChars); RT_C_DECLS_END #endif --- 60,66 ---- #if (defined(RT_OS_DARWIN) && defined(KERNEL)) \ || (defined(RT_OS_FREEBSD) && defined(_KERNEL)) RT_C_DECLS_BEGIN ! /* void *memchr(const void *pv, int ch, size_t cb); */ char *strpbrk(const char *pszStr, const char *pszChars); RT_C_DECLS_END #endif *** src/VBox/Frontends/VirtualBox/src/settings/vm/VBoxVMSettingsHD.h~ Wed Jun 2 10:04:53 2010 --- src/VBox/Frontends/VirtualBox/src/settings/vm/VBoxVMSettingsHD.h Thu Jun 3 14:21:11 2010 *************** *** 20,27 **** #define __VBoxVMSettingsHD_h__ /* Global includes */ - #include /* for Q_WS_MAC */ #ifdef Q_WS_MAC /* Somewhere Carbon.h includes AssertMacros.h which defines the macro "check". * In QItemDelegate a class method is called "check" also. As we not used the * macro undefine it here. */ --- 20,27 ---- #define __VBoxVMSettingsHD_h__ /* Global includes */ #ifdef Q_WS_MAC + #include /* for Q_WS_MAC */ /* Somewhere Carbon.h includes AssertMacros.h which defines the macro "check". * In QItemDelegate a class method is called "check" also. As we not used the * macro undefine it here. */