Merge branch 'tmj-dev' into milek-dev

2026-03-22 15:05:03 +01:00 · 2018-12-31 23:49:10 +01:00
parent eec2e38be8 bdbbaafc83
commit 4495f6a436
20 changed files with 575 additions and 489 deletions
--- a/PyInt.h
+++ b/PyInt.h
@@ -93,7 +93,7 @@ private:
    void error();
 // members
    PyObject *m_main { nullptr };
-    PyObject *m_error { nullptr };
+    PyObject *m_stderr { nullptr };
    PyThreadState *m_mainthread{ nullptr };
    worker_array m_workers;
    threading::condition_variable m_condition; // wakes up the workers