Merge branch 'milek-dev' into gfx-work

2026-07-21 00:09:19 +02:00 · 2019-01-01 00:25:18 +01:00
parent 2173a77eed 4495f6a436
commit de38d99ac1
20 changed files with 564 additions and 512 deletions
--- a/PyInt.h
+++ b/PyInt.h
@@ -116,7 +116,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