Use PBD string conversion functions in PBD::ID instead of snprintf

[ardour.git] / libs / pbd / cpus.cc

diff --git a/libs/pbd/cpus.cc b/libs/pbd/cpus.cc
index 0f73d51027012de4f1fd333a860be2399e886bbc..69421e5e9275e57543473baa60dbf37f30a3b1a8 100644 (file)
--- a/libs/pbd/cpus.cc
+++ b/libs/pbd/cpus.cc
@@ -28,6 +28,8 @@
 #include <stddef.h>
 #include <sys/types.h>
 #include <sys/sysctl.h>
+#elif defined(PLATFORM_WINDOWS)
+#include <windows.h>
 #endif
 
 #include "pbd/cpus.h"
@@ -41,13 +43,21 @@ hardware_concurrency()
 {
 #if defined(PTW32_VERSION) || defined(__hpux)
         return pthread_num_processors_np();
-#elif defined(__APPLE__) || defined(__FreeBSD__)
+#elif defined(__APPLE__)
         int count;
         size_t size=sizeof(count);
         return sysctlbyname("hw.physicalcpu",&count,&size,NULL,0)?0:count;
+#elif defined(__FreeBSD__)
+        int count;
+        size_t size=sizeof(count);
+        return sysctlbyname("hw.ncpu",&count,&size,NULL,0)?0:count;
 #elif defined(HAVE_UNISTD) && defined(_SC_NPROCESSORS_ONLN)
         int const count=sysconf(_SC_NPROCESSORS_ONLN);
         return (count>0)?count:0;
+#elif defined(PLATFORM_WINDOWS)
+               SYSTEM_INFO sys_info;
+               GetSystemInfo( &sys_info );
+               return sys_info.dwNumberOfProcessors;
 #else
         return 0;
 #endif