Fixed some stuff so it compiles on Windows again

Fixed some code errors for Windows.
oxagast · Dec 28, 2018 · 5a3089e · 5a3089e
1 parent 6dd5368
commit 5a3089e
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 3 deletions.
diff --git a/include/xmlwriter/xml_writer.hpp b/include/xmlwriter/xml_writer.hpp
@@ -10,7 +10,10 @@
 #include "include/stack.h"
 #endif
 #ifdef __ANDROID__
-# include "../stack.h"
+#include "../stack.h"
+#endif
+#ifdef __WIN32
+#include "../stack.h"
 #endif
 # include <iostream>
 

diff --git a/src/bin2hex.cpp b/src/bin2hex.cpp
@@ -53,8 +53,8 @@ hexxy = hex_out.str();
 //  }
   /* return to sys_string in hex */
     return (hex_out.str());
-  }
 #endif
+}
 
 std::string binstr_to_hex_pc(std::string bin_str) {
   /* initialize the hex to go out */

diff --git a/src/log.cpp b/src/log.cpp
@@ -12,6 +12,7 @@
 #endif
 #ifdef _WIN32
 #include "version.h"
+#include "../include/xmlwriter/xml_writer.hpp"
 #endif
 #include <cstdlib>
 #include <cstring>

diff --git a/src/match_fault.cpp b/src/match_fault.cpp
@@ -497,7 +497,7 @@ bool match_seg(struct Options o, struct RunCommands runit, struct Monopoly go, s
         if ((foundW1073741819 != std::string::npos) ||
 	(foundW1073740791 != std::string::npos) ||
 	(foundW1073741571 != std::string::npos) ||
-	(foundW532459699 != std::string::npos) {
+	(foundW532459699 != std::string::npos)) {
               cmd_output = cmd_output.replace(0, 22, "");
 #endif
 #ifdef __unix__

diff --git a/src/reaper.cpp b/src/reaper.cpp
@@ -22,6 +22,7 @@ int reaper(int grim, int t_timeout, std::string just_kill_me) {
   return (ret);
 #elif _WIN32
 /* windows doesn't support kill 9 */
+  return(1);
 #else
   return (0);
 #endif