TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-03 02:15:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release/1.10.x'

Browse Source
This commit is contained in:
rdb 2019-01-26 20:18:02 +01:00
commit ffa0c74402
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dtool/src/dtoolbase/atomicAdjustI386Impl.h
View File

@ -17,7 +17,7 @@
#include "dtoolbase.h" #include "dtoolbase.h"
#include "selectThreadImpl.h" #include "selectThreadImpl.h"
#if (defined(__i386__) || defined(_M_IX86)) && !defined(__APPLE__) #if (defined(__i386__) || defined(_M_IX86)) && !defined(__APPLE__) && !defined(__ANDROID__)
#include "numeric_types.h" #include "numeric_types.h"

4
dtool/src/interrogate/interfaceMakerPythonNative.cxx
View File

@ -4701,7 +4701,7 @@ write_function_instance(ostream &out, FunctionRemap *remap,
if (is_optional) { if (is_optional) {
extra_convert extra_convert
<< "wchar_t *" << param_name << "_str;\n" << "wchar_t *" << param_name << "_str = nullptr;\n"
<< "if (" << param_name << " != nullptr) {\n" << "if (" << param_name << " != nullptr) {\n"
<< "#if PY_VERSION_HEX >= 0x03030000\n" << "#if PY_VERSION_HEX >= 0x03030000\n"
<< " " << param_name << "_str = PyUnicode_AsWideCharString(" << param_name << ", nullptr);\n" << " " << param_name << "_str = PyUnicode_AsWideCharString(" << param_name << ", nullptr);\n"
@ -4748,7 +4748,7 @@ write_function_instance(ostream &out, FunctionRemap *remap,
if (is_optional) { if (is_optional) {
extra_convert extra_convert
<< "Py_ssize_t " << param_name << "_len;\n" << "Py_ssize_t " << param_name << "_len;\n"
<< "wchar_t *" << param_name << "_str;\n" << "wchar_t *" << param_name << "_str = nullptr;\n"
<< "std::wstring " << param_name << "_wstr;\n" << "std::wstring " << param_name << "_wstr;\n"
<< "if (" << param_name << " != nullptr) {\n" << "if (" << param_name << " != nullptr) {\n"
<< "#if PY_VERSION_HEX >= 0x03030000\n" << "#if PY_VERSION_HEX >= 0x03030000\n"