From a73e5fc871063c4bb5baac3535fe56656bddd748 Mon Sep 17 00:00:00 2001
From: Lukas Werling <lukas.werling@gmail.com>
Date: Sun, 14 Oct 2018 23:16:59 +0200
Subject: [PATCH] undef "s" macro in C4Config

Necessary for unity builds, but also has a high conflict probability in
general.
---
 src/config/C4Config.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/config/C4Config.cpp b/src/config/C4Config.cpp
index 1d29c46fe..95a5da55f 100644
--- a/src/config/C4Config.cpp
+++ b/src/config/C4Config.cpp
@@ -270,6 +270,8 @@ void C4ConfigControls::CompileFunc(StdCompiler *pComp)
 #endif
 }
 
+#undef s
+
 C4Config::C4Config()
 {
 	Default();