Date: Thu, 03 Jun 2010 15:10:24 -0400 From: Michael Butler <imb@protected-networks.net> To: freebsd-emulation@freebsd.org Subject: Re: VirtualBox 3.2.2 on -current Message-ID: <4C07FE20.2030308@protected-networks.net> In-Reply-To: <4C07FD1B.3060402@protected-networks.net> References: <4C07FCC4.7010901@protected-networks.net> <4C07FD1B.3060402@protected-networks.net>
next in thread | previous in thread | raw e-mail | index | archive | help
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 <qglobal.h> /* 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 <qglobal.h> /* 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. */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4C07FE20.2030308>