From: Martin Taibr <taibr.martin@gmail.com>
Date: Mon, 22 Apr 2019 22:46:51 +0000 (+0200)
Subject: no promises, no typed varargs (make lib compile)
X-Git-Tag: xonotic-v0.8.5~1285^2~2
X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=cee83985e3adc137911beaaa9196cc6800912cd0;hp=1f9714e90734b6c44be39fa9140837862bd52f5b;p=xonotic%2Fxonotic-data.pk3dir.git

no promises, no typed varargs (make lib compile)
---

diff --git a/qcsrc/lib/_all.inc b/qcsrc/lib/_all.inc
index ab7453160..c67e62575 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 94a58d0ca..3236d0ece 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, string...) strcat1n = #53;
+string(string, ...) strcat1n = #53;
 #else
-string(string, string...) strcat1n = #115;
+string(string, ...) strcat1n = #115;
 #endif
 
 // would be nice if __FUNC__ could be concatenated at compile time