# HG changeset patch
# User alex
# Date 1007918079 0
# Node ID ce4df7bff5e183d488fb9e24921d930d64c0c5d8
# Parent  1261ff74abd9f80d702190c3659e9adbd9c6b8a8
updated for avifile compilance

diff -r 1261ff74abd9 -r ce4df7bff5e1 loader/win32.c
--- a/loader/win32.c	Sun Dec 09 17:04:55 2001 +0000
+++ b/loader/win32.c	Sun Dec 09 17:14:39 2001 +0000
@@ -864,6 +864,7 @@
 	cachedsi.wProcessorLevel		= 5; /* pentium */
 	cachedsi.wProcessorRevision		= 0x0101;
 
+#ifdef USE_WIN32DLL
 	/* mplayer's way to detect PF's */
 	{
 	    #include "../cpudetect.h"
@@ -896,9 +897,10 @@
 	    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 @@
 	  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];