Ticket #45832: patch-js-src-jsgc.cpp.diff

js/src/jsgc.

@@ -95 +95 @@
 
 #ifdef XP_WIN
 # include "jswin.h"
-#else
-# include <unistd.h>
+#else   /* Handle Mac OS X < 10.5, pre-Leopard */
+# if __MAC_OS_X_VERSION_MIN_REQUIRED < 1050 || __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 1050
+#  include <sys/param.h>
+#  include <sys/sysctl.h>
+# else
+#  include <unistd.h>   /* On Mac OS X < 10.5 no definition of _SC_NPROCESSORS_ONLN */
+# endif
 #endif
 
 using namespace mozilla;
@@ -2864 +2869 @@
         SYSTEM_INFO sysinfo;
         GetSystemInfo(&sysinfo);
         ncpus = unsigned(sysinfo.dwNumberOfProcessors);
+# elif __MAC_OS_X_VERSION_MIN_REQUIRED < 1050 || __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 1050
+        int nm[2];
+        size_t len = 4;
+
+        nm[0] = CTL_HW; nm[1] = HW_AVAILCPU;
+        sysctl(nm, 2, &ncpus, &len, NULL, 0);
+
+        if(ncpus < 1) {
+        nm[1] = HW_NCPU;
+        sysctl(nm, 2, &ncpus, &len, NULL, 0);
+        if(ncpus < 1) { ncpus = 1; }
+        }
 # else
         long n = sysconf(_SC_NPROCESSORS_ONLN);
         ncpus = (n > 0) ? unsigned(n) : 1;