Merge branch 'pymod' of www.klayout.org:/home/matthias/klayout into pymod

This commit is contained in:
Matthias Koefferlein
2018-07-15 11:12:29 +02:00
3 changed files with 82 additions and 8 deletions
+2 -7
View File
@@ -250,13 +250,8 @@ PythonInterpreter::PythonInterpreter ()
const char *python_path = getenv ("KLAYOUT_PYTHONPATH");
if (python_path) {
QString path = QString::fromLocal8Bit (python_path);
if (sizeof (wchar_t) == 4) {
Py_SetPath ((const wchar_t *) path.toUcs4 ().constData ());
} else if (sizeof (wchar_t) == 2) {
Py_SetPath ((const wchar_t *) path.utf16 ());
}
std::wstring path = tl::to_wstring (tl::to_string_from_local (python_path));
Py_SetPath (path.c_str ());
}
+1 -1
View File
@@ -25,7 +25,7 @@
#ifndef ATOMIC_SPINLOCK_H_
#define ATOMIC_SPINLOCK_H_
#include "atomic/atomic.h"
#include "atomic.h"
namespace atomic {
class spinlock {