summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Friedman <eli.friedman@gmail.com>2010-06-09 18:31:38 +0000
committerEli Friedman <eli.friedman@gmail.com>2010-06-09 18:31:38 +0000
commitd0edb5b4a84e6240cf984e740e9cec36d025fa9d (patch)
tree606d36e6797aa33b1ab7be4db880d38259c30f10
parent61249085fd63c6e74e0d41c134b1b0ad7a9b75c8 (diff)
downloadbcm5719-llvm-d0edb5b4a84e6240cf984e740e9cec36d025fa9d.tar.gz
bcm5719-llvm-d0edb5b4a84e6240cf984e740e9cec36d025fa9d.zip
Don't include Python.h in the shared header.
llvm-svn: 105737
-rw-r--r--lldb/include/lldb/Interpreter/ScriptInterpreterPython.h4
-rw-r--r--lldb/source/Interpreter/ScriptInterpreterPython.cpp6
2 files changed, 5 insertions, 5 deletions
diff --git a/lldb/include/lldb/Interpreter/ScriptInterpreterPython.h b/lldb/include/lldb/Interpreter/ScriptInterpreterPython.h
index 3eceb829a97..3343072fdf5 100644
--- a/lldb/include/lldb/Interpreter/ScriptInterpreterPython.h
+++ b/lldb/include/lldb/Interpreter/ScriptInterpreterPython.h
@@ -14,8 +14,6 @@
#include "lldb/Interpreter/ScriptInterpreter.h"
#include "lldb/Core/InputReader.h"
-#include <Python.h>
-
namespace lldb_private {
class ScriptInterpreterPython : public ScriptInterpreter
@@ -75,7 +73,7 @@ private:
const char *bytes,
size_t bytes_len);
- PyObject *m_compiled_module;
+ void *m_compiled_module;
struct termios m_termios;
bool m_termios_valid;
};
diff --git a/lldb/source/Interpreter/ScriptInterpreterPython.cpp b/lldb/source/Interpreter/ScriptInterpreterPython.cpp
index 6b2e3b2e7ad..330e43742dc 100644
--- a/lldb/source/Interpreter/ScriptInterpreterPython.cpp
+++ b/lldb/source/Interpreter/ScriptInterpreterPython.cpp
@@ -179,7 +179,7 @@ ScriptInterpreterPython::ScriptInterpreterPython () :
PyObject *compiled_module = Py_CompileString (embedded_interpreter_string, "embedded_interpreter.py",
Py_file_input);
- m_compiled_module = compiled_module;
+ m_compiled_module = static_cast<void*>(compiled_module);
init_lldb ();
@@ -196,7 +196,9 @@ ScriptInterpreterPython::ScriptInterpreterPython () :
const char *pty_slave_name = GetScriptInterpreterPtyName ();
FILE *out_fh = Debugger::GetSharedInstance().GetOutputFileHandle();
- PyObject *pmod = PyImport_ExecCodeModule((char *)"embedded_interpreter", m_compiled_module);
+ PyObject *pmod = PyImport_ExecCodeModule(
+ const_cast<char*>("embedded_interpreter"),
+ static_cast<PyObject*>(m_compiled_module));
if (pmod != NULL)
{
PyRun_SimpleString ("ConsoleDict = locals()");
OpenPOWER on IntegriCloud