[Mplayer-cvslog] CVS: main/loader win32.c,1.34,1.35

[Alex Beregszaszi]

Update of /cvsroot/mplayer/main/loader
In directory mplayer:/var/tmp.root/cvs-serv16224

Modified Files:
	win32.c 
Log Message:
updated for avifile compilance

Index: win32.c
===================================================================
RCS file: /cvsroot/mplayer/main/loader/win32.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- win32.c	9 Dec 2001 17:04:55 -0000	1.34
+++ win32.c	9 Dec 2001 17:14:39 -0000	1.35
@@ -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];