aboutsummaryrefslogtreecommitdiff
path: root/zenserver/testing
diff options
context:
space:
mode:
authorPer Larsson <[email protected]>2022-03-23 14:03:01 +0100
committerPer Larsson <[email protected]>2022-03-23 14:03:01 +0100
commita1c5a93627fefa2db6dd3ae620e112ba46065f78 (patch)
tree90ae9bf52a10c1ecfcdd85c47fc89ceb22795162 /zenserver/testing
parentMap derived data references. (diff)
parentAdded route '/prj/list' for retrieving project info. (diff)
downloadzen-a1c5a93627fefa2db6dd3ae620e112ba46065f78.tar.xz
zen-a1c5a93627fefa2db6dd3ae620e112ba46065f78.zip
Merge branch 'main' into ddcref
Diffstat (limited to 'zenserver/testing')
-rw-r--r--zenserver/testing/launch.cpp4
-rw-r--r--zenserver/testing/launch.h8
2 files changed, 6 insertions, 6 deletions
diff --git a/zenserver/testing/launch.cpp b/zenserver/testing/launch.cpp
index f315ec1b4..0334429b0 100644
--- a/zenserver/testing/launch.cpp
+++ b/zenserver/testing/launch.cpp
@@ -2,7 +2,7 @@
#include "launch.h"
-#if ZEN_WITH_COMPUTE_SERVICES
+#if ZEN_WITH_EXEC_SERVICES
# include <zencore/compactbinary.h>
# include <zencore/compactbinarybuilder.h>
@@ -548,4 +548,4 @@ HttpLaunchService::CreateNewSandbox()
} // namespace zen
-#endif // ZEN_WITH_COMPUTE_SERVICES
+#endif // ZEN_WITH_EXEC_SERVICES
diff --git a/zenserver/testing/launch.h b/zenserver/testing/launch.h
index 925fa18b0..6fd3e39ae 100644
--- a/zenserver/testing/launch.h
+++ b/zenserver/testing/launch.h
@@ -4,11 +4,11 @@
#include <zencore/zencore.h>
-#if !defined(ZEN_WITH_COMPUTE_SERVICES)
-# define ZEN_WITH_COMPUTE_SERVICES ZEN_PLATFORM_WINDOWS
+#if !defined(ZEN_WITH_EXEC_SERVICES)
+# define ZEN_WITH_EXEC_SERVICES ZEN_PLATFORM_WINDOWS
#endif
-#if ZEN_WITH_COMPUTE_SERVICES
+#if ZEN_WITH_EXEC_SERVICES
# include <zencore/logging.h>
# include <zenhttp/httpserver.h>
@@ -45,4 +45,4 @@ private:
} // namespace zen
-#endif // ZEN_WITH_COMPUTE_SERVICES
+#endif // ZEN_WITH_EXEC_SERVICES