From b5c36c20ec32d9b624fad70f3c1f2bdac4412146 Mon Sep 17 00:00:00 2001 From: Martin Taibr Date: Fri, 26 Apr 2019 23:25:45 +0200 Subject: [PATCH] Revert "no promises, no typed varargs (make lib compile)" This reverts commit cee83985e3adc137911beaaa9196cc6800912cd0. --- qcsrc/lib/_all.inc | 2 +- qcsrc/lib/log.qh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qcsrc/lib/_all.inc b/qcsrc/lib/_all.inc index c67e625750..ab74531605 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 3236d0ece9..94a58d0ca4 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 -- 2.39.2