aboutsummaryrefslogtreecommitdiffstats
path: root/generator
diff options
context:
space:
mode:
authorHugo Parente Lima <hugo.pl@gmail.com>2011-09-14 15:44:01 -0300
committerHugo Parente Lima <hugo.pl@gmail.com>2012-03-08 16:17:14 -0300
commit24206196a34b4faeb4b720efcc84747f35accf94 (patch)
tree5ebfb058a208299d6bf65dae7f90442b50ecf52d /generator
parentdfd3c75a8ba6bc8a1ac42909d96bc6d4c11c6bd7 (diff)
Added sbkpython.h to deal with conflicts and missing symbols between Python2 and 3.
Diffstat (limited to 'generator')
-rw-r--r--generator/cppgenerator.cpp2
-rw-r--r--generator/headergenerator.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/generator/cppgenerator.cpp b/generator/cppgenerator.cpp
index 5b94d2ce8..8924f7b94 100644
--- a/generator/cppgenerator.cpp
+++ b/generator/cppgenerator.cpp
@@ -3794,7 +3794,7 @@ void CppGenerator::finishGeneration()
// write license comment
s << licenseComment() << endl;
- s << "#include <Python.h>" << endl;
+ s << "#include <sbkpython.h>" << endl;
s << "#include <shiboken.h>" << endl;
s << "#include <algorithm>" << endl;
if (usePySideExtensions())
diff --git a/generator/headergenerator.cpp b/generator/headergenerator.cpp
index 0fd137ea8..39d3eb4f0 100644
--- a/generator/headergenerator.cpp
+++ b/generator/headergenerator.cpp
@@ -422,7 +422,7 @@ void HeaderGenerator::finishGeneration()
s << "#define protected public" << endl << endl;
}
- s << "#include <Python.h>" << endl;
+ s << "#include <sbkpython.h>" << endl;
s << "#include <conversions.h>" << endl;
s << "#include <sbkenum.h>" << endl;
s << "#include <basewrapper.h>" << endl;