Retire platform specifics include in misc.cpp

Now that platform.h is included in types.h we
don't need this stuff anymore.

No functional change.

Signed-off-by: Marco Costalba <mcostalba@gmail.com>

diff --git a/src/misc.cpp b/src/misc.cpp
index 459c13ccccf887e6e72a8c8be9eafe633c6fed4c..3206a2d1950081229b0e9d3f623ba2db66dc8f81 100644 (file)
--- a/src/misc.cpp
+++ b/src/misc.cpp
@@ -17,24 +17,6 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
   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 <iomanip>
 #include <iostream>
 #include <sstream>
 #include <iomanip>
 #include <iostream>
 #include <sstream>


@@ -42,6 +24,10 @@
 #include "misc.h"
 #include "thread.h"
 
 #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
 using namespace std;
 
 /// Version number. If Version is left empty, then Tag plus current


@@ -219,6 +205,8 @@ void prefetch(char*) {}
 
 #else
 
 
 #else
 

+#   include <xmmintrin.h>
+

 void prefetch(char* addr) {
 
 #  if defined(__INTEL_COMPILER) || defined(__ICL)
 void prefetch(char* addr) {
 
 #  if defined(__INTEL_COMPILER) || defined(__ICL)