From: Bruno Haible <bruno@clisp.org>
Date: Sun, 18 Oct 2009 09:22:22 +0000 (+0200)
Subject: Implement nproc for mingw.
X-Git-Tag: v0.1~5308
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=fe8e9df2bc219bfa84ca8c04e75bca37ef5fda41;p=gnulib.git

Implement nproc for mingw.
---

diff --git a/ChangeLog b/ChangeLog
index 5a820cd30..fbd6694e7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 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.
 	* lib/nproc.c: Include <sys/sysmp.h>.
 	(num_processors): On IRIX systems, try sysmp.
diff --git a/lib/nproc.c b/lib/nproc.c
index 04a047cfb..b5a70b193 100644
--- 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;
 }