remove Windows/ICC support

tools/hscollider/CMakeLists.txt

@@ -65,31 +65,20 @@ set_source_files_properties(${hscollider_SOURCES} PROPERTIES
 add_executable(hscollider ${hscollider_SOURCES})
 add_dependencies(hscollider ragel_ColliderCorporaParser)
 
-if(NOT WIN32)
-    if (BUILD_CHIMERA)
-        target_link_libraries(hscollider hs chimera ${PCRE_LDFLAGS} databaseutil
-            expressionutil corpusomatic crosscompileutil pthread
-        "${BACKTRACE_LDFLAGS}")
-    else()
-        target_link_libraries(hscollider hs ${PCRE_LDFLAGS} databaseutil
-            expressionutil corpusomatic crosscompileutil pthread
-        "${BACKTRACE_LDFLAGS}")
-    endif()
+if (BUILD_CHIMERA)
+    target_link_libraries(hscollider hs chimera ${PCRE_LDFLAGS} databaseutil
+        expressionutil corpusomatic crosscompileutil pthread
+    "${BACKTRACE_LDFLAGS}")
+else()
+    target_link_libraries(hscollider hs ${PCRE_LDFLAGS} databaseutil
+        expressionutil corpusomatic crosscompileutil pthread
+    "${BACKTRACE_LDFLAGS}")
+endif()
 
 if(HAVE_BACKTRACE)
     set_source_files_properties(hscollider_SOURCES COMPILE_FLAGS
         "${BACKTRACE_CFLAGS}")
 endif()
-else() # WIN32
-    set_target_properties(hscollider PROPERTIES LINK_FLAGS "/STACK:8388608,8388608")
-    if (BUILD_CHIMERA)
-        target_link_libraries(hscollider hs chimera pcre databaseutil
-            expressionutil corpusomatic crosscompileutil)
-    else()
-        target_link_libraries(hscollider hs pcre databaseutil
-            expressionutil corpusomatic crosscompileutil)
-    endif()
-endif()
 
 add_custom_target(
     collide_quick_test

tools/hscollider/GroundTruth.cpp

@@ -26,9 +26,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifdef _WIN32
-#define PCRE_STATIC
-#endif
 #include "config.h"
 
 #include "common.h"

tools/hscollider/args.cpp

@@ -46,11 +46,7 @@
 #include <sstream>
 #include <string>
 #include <vector>
-#ifndef _WIN32
 #include <getopt.h>
-#else
-#include "win_getopt.h"
-#endif
 
 #define xstr(s) str(s)
 #define str(s) #s

tools/hscollider/main.cpp

@@ -1845,13 +1845,9 @@ bool needsQuotes(const char *s) {
     if (len == 0) {
         return true;
     }
-#ifndef _WIN32
     // don't confuse the correct isblank for the one in locale
     int (*blank)(int) = &std::isblank;
     if (find_if(s, s + len, blank) != s + len) {
-#else
-    if (find_if(s, s + len, [](unsigned char c){ return std::isblank(c); }) != s + len) {
-#endif
         return true;
     }
 

tools/hscollider/sig.cpp

@@ -36,7 +36,7 @@
 #include <ctype.h>
 #include <string>
 
-#if defined(HAVE_SIGACTION) || defined(_WIN32)
+#if defined(HAVE_SIGACTION)
 #include <signal.h>
 #endif
 
@@ -59,12 +59,8 @@ TLS_VARIABLE volatile size_t debug_corpus_len = 0;
 
 extern std::string g_cmdline;
 
-#if defined(_WIN32)
-static void __cdecl sighandler(int signum) {
-#elif defined(HAVE_SIGACTION)
+#if defined(HAVE_SIGACTION)
 static void sighandler(int signum) {
-#endif
-#if defined(HAVE_SIGACTION) || defined(_WIN32)
     /* NOTE: This signal handler is designed solely to provide more information
      * when a crash occurs in ue2collider -- it makes calls to signal-unsafe
      * functions like printf() and backtrace() by design, since we're already
@@ -149,12 +145,7 @@ static void sighandler(int signum) {
 
 void installSignalHandler(void) {
 
-#ifdef _WIN32
-    signal(SIGABRT, sighandler);
-    signal(SIGFPE, sighandler);
-    signal(SIGILL, sighandler);
-    signal(SIGSEGV, sighandler);
-#elif defined(HAVE_SIGACTION)
+#if defined(HAVE_SIGACTION)
     struct sigaction act;
     memset(&act, 0, sizeof(act));
     act.sa_handler = sighandler;

tools/hscollider/sig.h

@@ -40,11 +40,7 @@
 #define STAGE_GRAPH_COMPILE 6
 #define STAGE_GRAPH_RUN 7
 
-#ifndef WIN32
 #define TLS_VARIABLE __thread
-#else
-#define TLS_VARIABLE __declspec(thread)
-#endif
 
 extern TLS_VARIABLE volatile int debug_stage;
 extern TLS_VARIABLE volatile int debug_expr;