From 8f606b18080f11edd477eae1ddc7c3a30af029ee Mon Sep 17 00:00:00 2001 From: alex Date: Sun, 9 Dec 2001 17:14:39 +0000 Subject: updated for avifile compilance git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3406 b3059339-0415-0410-9bf9-f77b7e298cf2 --- loader/win32.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'loader') diff --git a/loader/win32.c b/loader/win32.c index 90197aad5e..f65e6aed7f 100644 --- a/loader/win32.c +++ b/loader/win32.c @@ -864,6 +864,7 @@ void WINAPI expGetSystemInfo(SYSTEM_INFO* si) cachedsi.wProcessorLevel = 5; /* pentium */ cachedsi.wProcessorRevision = 0x0101; +#ifdef USE_WIN32DLL /* mplayer's way to detect PF's */ { #include "../cpudetect.h" @@ -896,9 +897,10 @@ void WINAPI expGetSystemInfo(SYSTEM_INFO* si) cachedsi.wProcessorRevision = gCpuCaps.cpuStepping; cachedsi.dwNumberOfProcessors = 1; /* hardcoded */ } +#endif /* disable cpuid based detection (mplayer's cpudetect.c does this - see above) */ -#if 0 +#ifndef USE_WIN32DLL #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__svr4__) do_cpuid(1, regs); switch ((regs[0] >> 8) & 0xf) { // cpu family @@ -929,10 +931,11 @@ void WINAPI expGetSystemInfo(SYSTEM_INFO* si) PF[PF_AMD3D_INSTRUCTIONS_AVAILABLE] = TRUE; cachedsi.dwNumberOfProcessors=1; #endif -#endif /* if 0 */ +#endif /* USE_WIN32DLL */ + -/* linux detection enabled (based on proc/cpuinfo) for checking - fdiv_bug and fpu emulation flags -- alex */ +/* MPlayer: linux detection enabled (based on proc/cpuinfo) for checking + fdiv_bug and fpu emulation flags -- alex/MPlayer */ #ifdef __linux__ { char buf[20]; -- cgit v1.2.3