Build updates for Windows

2021-03-05 10:31:00 +00:00
parent 8b86e0862c
commit 120edca223
8 changed files with 119 additions and 87 deletions
--- a/src/base/Scavenger.h
+++ b/src/base/Scavenger.h
@@ -29,7 +29,7 @@
 #include <utility>
 #include <iostream>

-#ifndef WIN32
+#ifndef _MSC_VER
 #include <sys/time.h>
 #endif

--- a/src/system/sysutils.h
+++ b/src/system/sysutils.h
@@ -24,13 +24,6 @@
 #ifndef RUBBERBAND_SYSUTILS_H
 #define RUBBERBAND_SYSUTILS_H

-#ifdef _MSC_VER
-#  if _MSC_VER < 1800
-#    include "float_cast/float_cast.h"
-#  endif
-#  define R__ __restrict
-#endif 
-
 #ifdef __clang__
 #  define R__ __restrict__
 #else
@@ -39,6 +32,15 @@
 #  endif
 #endif

+#ifdef _MSC_VER
+#  if _MSC_VER < 1800
+#    include "float_cast/float_cast.h"
+#  endif
+#  ifndef R__
+#    define R__ __restrict
+#  endif
+#endif 
+
 #ifndef R__
 #  define R__
 #endif