Implement nproc for mingw.

diff --git a/ChangeLog b/ChangeLog
index 5a820cd30db07cf0572afb659ed55e6b0d8da345..fbd6694e7cb8416aac924961b3baaf331d866dad 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-10-18  Bruno Haible  <bruno@clisp.org>
+
+       Implement nproc for mingw.
+       * lib/nproc.c: Include <windows.h>
+       (num_processors): On native Windows platforms, try GetSystemInfo.
+
 2009-10-18  Bruno Haible  <bruno@clisp.org>
 
        Implement nproc for IRIX.

diff --git a/lib/nproc.c b/lib/nproc.c
index 04a047cfb4fa895708bbb2a88d839b6dd7f5f9cc..b5a70b193a87ac0419e29e436f4fe8828089b5cc 100644 (file)
--- a/lib/nproc.c
+++ b/lib/nproc.c
@@ -41,6 +41,11 @@
 # include <sys/sysctl.h>
 #endif
 
+#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+# define WIN32_LEAN_AND_MEAN
+# include <windows.h>
+#endif
+
 #define ARRAY_SIZE(a) (sizeof (a) / sizeof ((a)[0]))
 
 /* Return the total number of processors.  The result is guaranteed to
@@ -90,5 +95,14 @@ num_processors (void)
   }
 #endif
 
+#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+  { /* This works on native Windows platforms.  */
+    SYSTEM_INFO system_info;
+    GetSystemInfo (&system_info);
+    if (0 < system_info.dwNumberOfProcessors)
+      return system_info.dwNumberOfProcessors;
+  }
+#endif
+
   return 1;
 }