HPCC-20754 Fix a couple of windows link issues

Signed-off-by: Gavin Halliday <gavin.halliday@lexisnexis.com>

deployment/configenv/xml_jlibpt/CMakeLists.txt

@@ -55,6 +55,7 @@ set (    SRCS
          ../common/GenEnvRules.cpp
          EnvHelper.cpp
          ComponentBase.cpp
+         ConfigEnvFactory.cpp
          SWComponentBase.cpp
          Hardware.cpp
          Programs.cpp

deployment/configenv/xml_jlibpt/ConfigEnvFactory.cpp

@@ -0,0 +1,39 @@
+/*##############################################################################
+
+    HPCC SYSTEMS software Copyright (C) 2018 HPCC Systems®.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+############################################################################## */
+
+#include "jiface.hpp"
+#include "jliball.hpp"
+
+#include "IConfigEnv.hpp"
+#include "ConfigEnvFactory.hpp"
+
+namespace ech
+{
+
+IConfigEnv<IPropertyTree,StringBuffer> * ConfigEnvFactory::getIConfigEnv(IPropertyTree *config)
+{
+    return  new ConfigEnv(config);
+}
+
+void ConfigEnvFactory::destroy( IConfigEnv<IPropertyTree,StringBuffer> * iCfgEnv)
+{
+    ConfigEnv * cfgEnv = (ConfigEnv *) iCfgEnv;
+    delete cfgEnv;
+}
+
+}
+

deployment/configenv/xml_jlibpt/ConfigEnvFactory.hpp

@@ -36,16 +36,8 @@ namespace ech
 class configenv_decl ConfigEnvFactory
 {
 public:
-  static IConfigEnv<IPropertyTree,StringBuffer> * getIConfigEnv(IPropertyTree *config)
-  {
-    return  new ConfigEnv(config);
-  }
-
-  static void destroy( IConfigEnv<IPropertyTree,StringBuffer> * iCfgEnv)
-  {
-      ConfigEnv * cfgEnv = (ConfigEnv *) iCfgEnv;
-      delete cfgEnv;
-  }
+    static IConfigEnv<IPropertyTree, StringBuffer> * getIConfigEnv(IPropertyTree *config);
+    static void destroy(IConfigEnv<IPropertyTree, StringBuffer> * iCfgEnv);
 };
 
 }

rtl/eclrtl/eclrtl.cpp

@@ -6062,7 +6062,7 @@ ECLRTL_API IRowStream * createRowStream(size32_t count, const byte * * rowset)
 
 //The following are provided to provide compatibility with 6.x so that the dll can be loaded
 //Defined at the end of the file so they cannot cause any code to accidently call them.
-__declspec(noreturn) void jlib_decl throwIncompatible() __attribute__((noreturn));
+__declspec(noreturn) void throwIncompatible() __attribute__((noreturn));
 void throwIncompatible() { rtlFail(0, "Attempt to execute incompatible query version"); }
 
 ECLRTL_API int rtlSearchTableStringN(unsigned count, char * * table, unsigned width, const char * search) { throwIncompatible(); }