Merge pull request #10897 from ghalliday/issue19149

HPCC-19149 Fix windows build problems

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>

CMakeLists.txt

@@ -176,7 +176,9 @@ elseif ( NOT MAKE_DOCS_ONLY )
     HPCC_ADD_SUBDIRECTORY (services "PLATFORM")
     HPCC_ADD_SUBDIRECTORY (thorlcr "PLATFORM")
     HPCC_ADD_SUBDIRECTORY (testing)
-    HPCC_ADD_SUBDIRECTORY (configuration)
+    if ( NOT WIN32 )
+        HPCC_ADD_SUBDIRECTORY (configuration)
+    endif()
 
     if ( WIN32 )
         HPCC_ADD_SUBDIRECTORY (clienttools/IDEPlugins "CLIENTTOOLS_ONLY")

common/thorhelper/thorcommon.cpp

@@ -38,6 +38,7 @@
 #include "roxiemem.hpp"
 #include "thorstep.hpp"
 #include "roxiemem.hpp"
+#undef new
 
 #define ROWAGG_PERROWOVERHEAD (sizeof(AggregateRowBuilder))