X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmisc.cpp;h=3206a2d1950081229b0e9d3f623ba2db66dc8f81;hp=8bc413f47be9657217ce0151a0604702f3b100c0;hb=72641dcaae2241c830254fc19b742eb477d831a3;hpb=3b7dbc4f6d68928ad97a5d77561509232dd23f78

diff --git a/src/misc.cpp b/src/misc.cpp
index 8bc413f4..3206a2d1 100644
--- a/src/misc.cpp
+++ b/src/misc.cpp
@@ -17,25 +17,6 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if defined(_WIN32) || defined(_WIN64)
-
-#define NOMINMAX // disable macros min() and max()
-#include <windows.h>
-
-#else
-
-#  include <unistd.h>
-#  if defined(__hpux)
-#     include <sys/pstat.h>
-#  endif
-
-#endif
-
-#if !defined(NO_PREFETCH)
-#  include <xmmintrin.h>
-#endif
-
-#include <algorithm>
 #include <iomanip>
 #include <iostream>
 #include <sstream>
@@ -43,6 +24,10 @@
 #include "misc.h"
 #include "thread.h"
 
+#if defined(__hpux)
+#    include <sys/pstat.h>
+#endif
+
 using namespace std;
 
 /// Version number. If Version is left empty, then Tag plus current
@@ -174,16 +159,16 @@ int cpu_count() {
 #if defined(_WIN32) || defined(_WIN64)
   SYSTEM_INFO s;
   GetSystemInfo(&s);
-  return std::min(int(s.dwNumberOfProcessors), MAX_THREADS);
+  return s.dwNumberOfProcessors;
 #else
 
 #  if defined(_SC_NPROCESSORS_ONLN)
-  return std::min((int)sysconf(_SC_NPROCESSORS_ONLN), MAX_THREADS);
+  return sysconf(_SC_NPROCESSORS_ONLN);
 #  elif defined(__hpux)
   struct pst_dynamic psd;
   if (pstat_getdynamic(&psd, sizeof(psd), (size_t)1, 0) == -1)
       return 1;
-  return std::min((int)psd.psd_proc_cnt, MAX_THREADS);
+  return psd.psd_proc_cnt;
 #  else
   return 1;
 #  endif
@@ -220,6 +205,8 @@ void prefetch(char*) {}
 
 #else
 
+#   include <xmmintrin.h>
+
 void prefetch(char* addr) {
 
 #  if defined(__INTEL_COMPILER) || defined(__ICL)