From 8308e63eb1f9203e53f13698e7a2bfb362ccceaf Mon Sep 17 00:00:00 2001 From: diego Date: Wed, 25 May 2005 08:48:32 +0000 Subject: DragonFly BSD support patch by Joerg Sonnenberger git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15567 b3059339-0415-0410-9bf9-f77b7e298cf2 --- loader/ldt_keeper.c | 8 ++++---- loader/pe_image.c | 2 +- loader/win32.c | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'loader') diff --git a/loader/ldt_keeper.c b/loader/ldt_keeper.c index 0e2ab31b19..3b5bf937e1 100644 --- a/loader/ldt_keeper.c +++ b/loader/ldt_keeper.c @@ -50,7 +50,7 @@ int modify_ldt(int func, void *ptr, unsigned long bytecount); } #endif #else -#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) +#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) #include #include #endif @@ -165,7 +165,7 @@ static int LDT_Modify( int func, struct modify_ldt_ldt_s *ptr, #endif #endif -#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) +#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) static void LDT_EntryToBytes( unsigned long *buffer, const struct modify_ldt_ldt_s *content ) { *buffer++ = ((content->base_addr & 0x0000ffff) << 16) | @@ -227,7 +227,7 @@ ldt_fs_t* Setup_LDT_Keeper(void) } #endif /*linux*/ -#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) +#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) { unsigned long d[2]; @@ -246,7 +246,7 @@ ldt_fs_t* Setup_LDT_Keeper(void) printf("Did you reconfigure the kernel with \"options USER_LDT\"?\n"); } } -#endif /* __NetBSD__ || __FreeBSD__ || __OpenBSD__ */ +#endif /* __NetBSD__ || __FreeBSD__ || __OpenBSD__ || __DragonFly__ */ #if defined(__svr4__) { diff --git a/loader/pe_image.c b/loader/pe_image.c index 97dae9068f..ab2fb9be61 100644 --- a/loader/pe_image.c +++ b/loader/pe_image.c @@ -905,7 +905,7 @@ void PE_UnloadLibrary(WINE_MODREF *wm) */ static void __attribute__((noinline)) extend_stack_for_dll_alloca(void) { -#ifndef __FreeBSD__ +#if !defined(__FreeBSD__) && !defined(__DragonFly__) volatile int* mem=alloca(0x20000); *mem=0x1234; #endif diff --git a/loader/win32.c b/loader/win32.c index 5f0d9d3e8c..b73a3b9ebd 100644 --- a/loader/win32.c +++ b/loader/win32.c @@ -993,7 +993,7 @@ static void WINAPI expGetSystemInfo(SYSTEM_INFO* si) /* disable cpuid based detection (mplayer's cpudetect.c does this - see above) */ #ifndef MPLAYER -#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__svr4__) +#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__svr4__) || defined(__DragonFly__) do_cpuid(1, regs); switch ((regs[0] >> 8) & 0xf) { // cpu family case 3: cachedsi.dwProcessorType = PROCESSOR_INTEL_386; -- cgit v1.2.3