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 c67e625750367b2c57a0f5de6d05e0498c71449b..ab74531605f29a44d7f69c23b7ba99e4f30a3479 100644 (file)
--- 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 3236d0ece9efffc676c581c797ce35a307725b34..94a58d0ca486636e9a917429b677f4aeb726f204 100644 (file)
--- 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