Merge pull request #13449 from ghalliday/issue23648

HPCC-23648 Move function to the correct header file

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

common/environment/environment.hpp

@@ -289,6 +289,7 @@ extern ENVIRONMENT_API unsigned getEnvironmentClusterInfo(IPropertyTree* environ
 extern ENVIRONMENT_API void getRoxieProcessServers(const char *process, SocketEndpointArray &servers);
 extern ENVIRONMENT_API bool isProcessCluster(const char *remoteDali, const char *process);
 extern ENVIRONMENT_API bool isProcessCluster(const char *process);
+extern ENVIRONMENT_API unsigned getEnvironmentThorClusterNames(StringArray &thorNames, StringArray &groupNames, StringArray &targetNames, StringArray &queueNames);
 
 #endif // _ENVIRONMENT_INCL
 //end

common/workunit/workunit.hpp

@@ -1527,7 +1527,6 @@ extern WORKUNIT_API bool getWorkUnitCreateTime(const char *wuid,CDateTime &time)
 extern WORKUNIT_API void clientShutdownWorkUnit();
 extern WORKUNIT_API IExtendedWUInterface * queryExtendedWU(IConstWorkUnit * wu);
 extern WORKUNIT_API const IExtendedWUInterface * queryExtendedWU(const IConstWorkUnit * wu);
-extern WORKUNIT_API unsigned getEnvironmentThorClusterNames(StringArray &thorNames, StringArray &groupNames, StringArray &targetNames, StringArray &queueNames);
 extern WORKUNIT_API StringBuffer &formatGraphTimerLabel(StringBuffer &str, const char *graphName, unsigned subGraphNum=0, unsigned __int64 subId=0);
 extern WORKUNIT_API StringBuffer &formatGraphTimerScope(StringBuffer &str, unsigned wfid, const char *graphName, unsigned subGraphNum, unsigned __int64 subId);
 extern WORKUNIT_API bool parseGraphTimerLabel(const char *label, StringAttr &graphName, unsigned & graphNum, unsigned &subGraphNum, unsigned &subId);

dali/sasha/saqmon.cpp

@@ -11,6 +11,7 @@
 #include "saserver.hpp"
 #include "workunit.hpp"
 #include "wujobq.hpp"
+#include "environment.hpp"
 
 //#define TESTING