From 30d1beba4d8ab3db48fd7bf8d6cc63d565c20e9c Mon Sep 17 00:00:00 2001
From: Martin Ridgers <martin.ridgers@epicgames.com>
Date: Wed, 3 Nov 2021 09:25:54 +0100
Subject: Removed if-def ZEN_PLATFORM_WINDOWS as its covered by WITH_COMPUTE
 now

---
 zenserver/testing/launch.cpp | 30 +++++++-----------------------
 1 file changed, 7 insertions(+), 23 deletions(-)

(limited to 'zenserver/testing/launch.cpp')

diff --git a/zenserver/testing/launch.cpp b/zenserver/testing/launch.cpp
index 8e58b481e..013aa28b8 100644
--- a/zenserver/testing/launch.cpp
+++ b/zenserver/testing/launch.cpp
@@ -11,20 +11,17 @@
 #include <zencore/iobuffer.h>
 #include <zencore/iohash.h>
 #include <zencore/logging.h>
+#include <zencore/windows.h>
 #include <zenstore/cas.h>
 
-#if ZEN_PLATFORM_WINDOWS
-#	include <zencore/windows.h>
-
 ZEN_THIRD_PARTY_INCLUDES_START
-#	include <AccCtrl.h>
-#	include <AclAPI.h>
-#	include <atlbase.h>
-#	include <sddl.h>
-#	include <UserEnv.h>
+#include <AccCtrl.h>
+#include <AclAPI.h>
+#include <atlbase.h>
+#include <sddl.h>
+#include <UserEnv.h>
 ZEN_THIRD_PARTY_INCLUDES_END
-#	pragma comment(lib, "UserEnv.lib")
-#endif
+#pragma comment(lib, "UserEnv.lib")
 
 #include <filesystem>
 #include <span>
@@ -33,7 +30,6 @@ using namespace std::literals;
 
 namespace zen {
 
-#if ZEN_PLATFORM_WINDOWS
 struct BasicJob
 {
 public:
@@ -133,19 +129,9 @@ BasicJob::ExitCode()
 
 	return gsl::narrow_cast<int>(Ec);
 }
-#else
-	struct BasicJob
-	{
-		void	SetWorkingDirectory(...);
-		void	SpawnJob(...);
-		void	Wait();
-		int32_t	ExitCode();
-	};
-#endif // ZEN_PLATFORM_WINDOWS
 
 ////////////////////////////////////////////////////////////////////////////////
 
-#if ZEN_PLATFORM_WINDOWS
 struct SandboxedJob
 {
 	SandboxedJob()	= default;
@@ -335,8 +321,6 @@ SandboxedJob::SpawnJob(std::filesystem::path ExePath)
 
 	return true;
 }
-#else
-#endif // ZEN_PLATFORM_WINDOWS
 
 ////////////////////////////////////////////////////////////////////////////////
 
-- 
cgit v1.2.3