more win32threads -> pthreads

git-svn-id: svn://svn.videolan.org/x264/trunk@610 df754926-b1dd-0310-bc7b-ec298dee348c

diff --git a/common/cpu.c b/common/cpu.c
index 49eee3b17c8960671d4b1c5436de843017a09e3e..b7b1ac84253721fd87c7eb9568935dd20c264ab9 100644 (file)
--- a/common/cpu.c
+++ b/common/cpu.c
@@ -162,17 +162,15 @@ int x264_cpu_num_processors( void )
 #if !defined(HAVE_PTHREAD)
     return 1;
 
-#elif defined(SYS_LINUX) || defined(WIN32)
+#elif defined(WIN32)
+    return pthread_num_processors_np();
+
+#elif defined(SYS_LINUX)
     unsigned int bit;
     int np;
-#if defined(WIN32)
-    uint32_t p_aff, s_aff;
-    GetProcessAffinityMask( GetCurrentProcess(), &p_aff, &s_aff );
-#else
     cpu_set_t p_aff;
     memset( &p_aff, 0, sizeof(p_aff) );
     sched_getaffinity( 0, sizeof(p_aff), &p_aff );
-#endif
     for( np = 0, bit = 0; bit < sizeof(p_aff); bit++ )
         np += (((uint8_t *)&p_aff)[bit / 8] >> (bit % 8)) & 1;
     return np;