From: Martin Taibr <taibr.martin@gmail.com>
Date: Fri, 26 Apr 2019 21:25:45 +0000 (+0200)
Subject: Revert "no promises, no typed varargs (make lib compile)"
X-Git-Tag: xonotic-v0.8.5~1285^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b5c36c20ec32d9b624fad70f3c1f2bdac4412146;p=xonotic%2Fxonotic-data.pk3dir.git

Revert "no promises, no typed varargs (make lib compile)"

This reverts commit cee83985e3adc137911beaaa9196cc6800912cd0.
---

diff --git a/qcsrc/lib/_all.inc b/qcsrc/lib/_all.inc
index c67e62575..ab7453160 100644
--- a/qcsrc/lib/_all.inc
+++ b/qcsrc/lib/_all.inc
@@ -133,7 +133,7 @@
 #include "oo.qh"
 #include "p2mathlib.qc"
 #include "progname.qh"
-//#include "promise.qc"
+#include "promise.qc"
 #include "random.qc"
 #include "registry.qh"
 #include "registry_net.qh"
diff --git a/qcsrc/lib/log.qh b/qcsrc/lib/log.qh
index 3236d0ece..94a58d0ca 100644
--- a/qcsrc/lib/log.qh
+++ b/qcsrc/lib/log.qh
@@ -35,9 +35,9 @@ void print_assertfailed_fatal(string expr);
 
 
 #if defined(MENUQC)
-string(string, ...) strcat1n = #53;
+string(string, string...) strcat1n = #53;
 #else
-string(string, ...) strcat1n = #115;
+string(string, string...) strcat1n = #115;
 #endif
 
 // would be nice if __FUNC__ could be concatenated at compile time