remove Windows/ICC support

unit/CMakeLists.txt

@@ -1,13 +1,6 @@
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_C_FLAGS}")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${EXTRA_CXX_FLAGS}")
 
-if(CMAKE_C_FLAGS MATCHES "/Gv" )
-    string(REPLACE "/Gv" "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
-endif()
-if(CMAKE_CXX_FLAGS MATCHES "/Gv" )
-    string(REPLACE "/Gv" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-endif()
-
 set(gtest_SOURCES gtest/gtest-all.cc gtest/gtest.h)
 include_directories(SYSTEM ${CMAKE_CURRENT_SOURCE_DIR})
 include_directories(${PROJECT_SOURCE_DIR})
@@ -38,10 +31,6 @@ endif()
 
 add_definitions(-DGTEST_HAS_PTHREAD=0 -DSRCDIR=${PROJECT_SOURCE_DIR})
 
-if (WIN32)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4309 /wd4018")
-endif()
-
 set(unit_hyperscan_SOURCES
     ${gtest_SOURCES}
     hyperscan/allocators.cpp
@@ -135,11 +124,7 @@ set(unit_internal_SOURCES
    )
 endif(BUILD_AVX2)
 
-if(WIN32 AND (BUILD_STATIC_AND_SHARED OR BUILD_SHARED_LIBS))
-add_executable(unit-internal ${unit_internal_SOURCES} $<TARGET_OBJECTS:hs_compile_shared> $<TARGET_OBJECTS:hs_exec_shared>)
-else()
 add_executable(unit-internal ${unit_internal_SOURCES})
-endif()
 set_target_properties(unit-internal PROPERTIES COMPILE_FLAGS "${HS_CXX_FLAGS}")
 target_link_libraries(unit-internal hs corpusomatic)
 endif(NOT (RELEASE_BUILD OR FAT_RUNTIME))

unit/hyperscan/test_util.h

@@ -37,9 +37,6 @@
 #include <vector>
 
 #ifndef UNUSED
-#if defined(_WIN32) || defined(_WIN64)
-#define UNUSED
-#else
 #define UNUSED __attribute__ ((unused))
 #endif
 #endif
@@ -124,5 +121,3 @@ void *count_malloc(size_t n);
 void *count_malloc_b(size_t n);
 void count_free(void *p);
 void count_free_b(void *p);
-
-#endif