Austin English : libwine: Add missing checks for FreeBSD_kernel.
Alexandre Julliard
julliard at winehq.org
Mon Jan 17 10:59:47 CST 2011
Module: wine
Branch: master
Commit: b21319231e321f38f6dad362c9d9339e818edfcf
URL: http://source.winehq.org/git/wine.git/?a=commit;h=b21319231e321f38f6dad362c9d9339e818edfcf
Author: Austin English <austinenglish at gmail.com>
Date: Sat Jan 15 15:52:50 2011 -0800
libwine: Add missing checks for FreeBSD_kernel.
---
libs/wine/ldt.c | 2 +-
libs/wine/mmap.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/libs/wine/ldt.c b/libs/wine/ldt.c
index c4dcb0e..3098061 100644
--- a/libs/wine/ldt.c
+++ b/libs/wine/ldt.c
@@ -412,7 +412,7 @@ void wine_ldt_init_fs( unsigned short sel, const LDT_ENTRY *entry )
ldt_info.entry_number = sel >> 3;
fill_modify_ldt_struct( &ldt_info, entry );
if ((ret = set_thread_area( &ldt_info ) < 0)) perror( "set_thread_area" );
-#elif defined(__FreeBSD__)
+#elif defined(__FreeBSD__) || defined (__FreeBSD_kernel__)
i386_set_fsbase( wine_ldt_get_base( entry ));
#endif
}
diff --git a/libs/wine/mmap.c b/libs/wine/mmap.c
index f0665b1..0e02d16 100644
--- a/libs/wine/mmap.c
+++ b/libs/wine/mmap.c
@@ -372,7 +372,7 @@ void mmap_init(void)
char *base = stack_ptr - ((unsigned int)stack_ptr & granularity_mask) - (granularity_mask + 1);
if (base > user_space_limit) reserve_area( user_space_limit, base );
base = stack_ptr - ((unsigned int)stack_ptr & granularity_mask) + (granularity_mask + 1);
-#if defined(linux) || defined(__FreeBSD__)
+#if defined(linux) || defined(__FreeBSD__) || defined (__FreeBSD_kernel__)
/* Heuristic: assume the stack is near the end of the address */
/* space, this avoids a lot of futile allocation attempts */
end = (char *)(((unsigned long)base + 0x0fffffff) & 0xf0000000);
More information about the wine-cvs
mailing list