[x265] [PATCH] Threadpool: correctly detect 'mac' os

praveen at multicorewareinc.com praveen at multicorewareinc.com
Thu Feb 2 15:21:23 CET 2017


# HG changeset patch
# User Praveen Tiwari <praveen at multicorewareinc.com>
# Date 1486045258 -19800
#      Thu Feb 02 19:50:58 2017 +0530
# Node ID 573841e2efb5a68e9d4951bf287c7a64dfa72823
# Parent  fa52b516f5ff122c4486ed840c5bf1de3c06e974
Threadpool: correctly detect 'mac' os

diff -r fa52b516f5ff -r 573841e2efb5 source/common/threadpool.cpp
--- a/source/common/threadpool.cpp	Mon Jan 30 10:35:00 2017 +0530
+++ b/source/common/threadpool.cpp	Thu Feb 02 19:50:58 2017 +0530
@@ -57,7 +57,7 @@
 
 #endif
 
-#if MACOS
+#if __APPLE__ && __MACH__
 #include <sys/param.h>
 #include <sys/sysctl.h>
 #endif
@@ -617,7 +617,7 @@
     return sysconf(_SC_NPROCESSORS_CONF);
 #elif __unix__
     return sysconf(_SC_NPROCESSORS_ONLN);
-#elif MACOS
+#elif __APPLE__ && __MACH__
     int nm[2];
     size_t len = 4;
     uint32_t count;


More information about the x265-devel mailing list