André Hentschel : libwine: Add checks for DragonFly BSD.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: e369e79bd545e491b38c415bb85daeb27c906415
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=e369e79bd545e491b38c415bb8...

Author: André Hentschel 
Date:   Mon May 28 19:26:45 2012 +0200

libwine: Add checks for DragonFly BSD.

---

libs/wine/ldt.c  |    6 +++---
 libs/wine/mmap.c |    4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/libs/wine/ldt.c b/libs/wine/ldt.c
index 4e48b16..85a835b 100644
--- a/libs/wine/ldt.c
+++ b/libs/wine/ldt.c
@@ -87,7 +87,7 @@ static inline int set_thread_area( struct modify_ldt_s *ptr )
 #endif
 #endif

-#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__)
+#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) || defined(__DragonFly__)
 #include <machine/segments.h>
 #include <machine/sysarch.h>
 #endif  /* __NetBSD__ || __FreeBSD__ || __OpenBSD__ */
@@ -175,7 +175,7 @@ static int internal_set_entry( unsigned short sel, const LDT_ENTRY *entry )
         if ((ret = modify_ldt(0x11, &ldt_info, sizeof(ldt_info))) < 0)
             perror( "modify_ldt" );
     }
-#elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__)
+#elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) || defined(__DragonFly__)
     {
    LDT_ENTRY entry_copy = *entry;
    /* The kernel will only let us set LDTs with user priority level */
@@ -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__) || defined (__FreeBSD_kernel__)
+#elif defined(__FreeBSD__) || defined (__FreeBSD_kernel__) || defined(__DragonFly__)
         i386_set_fsbase( wine_ldt_get_base( entry ));
 #endif
     }
diff --git a/libs/wine/mmap.c b/libs/wine/mmap.c
index 6ec814a..44fc53f 100644
--- a/libs/wine/mmap.c
+++ b/libs/wine/mmap.c
@@ -205,7 +205,7 @@ void *wine_anon_mmap( void *start, size_t size, int prot, int flags )

if (!(flags & MAP_FIXED))
     {
-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
         /* Even FreeBSD 5.3 does not properly support NULL here. */
         if( start == NULL ) start = (void *)0x110000;
 #endif
@@ -377,7 +377,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__) || defined (__FreeBSD_kernel__)
+#if defined(linux) || defined(__FreeBSD__) || defined (__FreeBSD_kernel__) || defined(__DragonFly__)
         /* 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);