diff options
| author | serge-sans-paille <sguelton@redhat.com> | 2019-11-05 14:15:09 +0100 |
|---|---|---|
| committer | serge-sans-paille <sguelton@redhat.com> | 2019-11-26 15:46:26 +0100 |
| commit | 9b2d207cf4b43cfc1a2b6940b3c06e50a1bd127f (patch) | |
| tree | 74175dc46b6f463a1c51080baab2cafa7d5f14ca | |
| parent | 62a16ca77d683f8d898f4b0a85c1ee17bdf31fc1 (diff) | |
| download | llvm-9b2d207cf4b43cfc1a2b6940b3c06e50a1bd127f.zip llvm-9b2d207cf4b43cfc1a2b6940b3c06e50a1bd127f.tar.gz llvm-9b2d207cf4b43cfc1a2b6940b3c06e50a1bd127f.tar.bz2 | |
[lldb] Fix readline/libedit compat patch for py2
This is a follow-up to https://reviews.llvm.org/D69793
(cherry picked from commit d590498829d8c0d4f4f673569949fa3850485c9c)
| -rw-r--r-- | lldb/source/Plugins/ScriptInterpreter/Python/PythonReadline.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/lldb/source/Plugins/ScriptInterpreter/Python/PythonReadline.cpp b/lldb/source/Plugins/ScriptInterpreter/Python/PythonReadline.cpp index 616522f..674ec9b 100644 --- a/lldb/source/Plugins/ScriptInterpreter/Python/PythonReadline.cpp +++ b/lldb/source/Plugins/ScriptInterpreter/Python/PythonReadline.cpp @@ -49,7 +49,11 @@ simple_readline(FILE *stdin, FILE *stdout, char *prompt) rl_outstream = stdout; char *line = readline(prompt); if (!line) { +#if PY_MAJOR_VERSION >= 3 char *ret = (char *)PyMem_RawMalloc(1); +#else + char *ret = (char *)PyMem_Malloc(1); +#endif if (ret != NULL) *ret = '\0'; return ret; @@ -57,7 +61,11 @@ simple_readline(FILE *stdin, FILE *stdout, char *prompt) if (*line) add_history(line); int n = strlen(line); +#if PY_MAJOR_VERSION >= 3 char *ret = (char *)PyMem_RawMalloc(n + 2); +#else + char *ret = (char *)PyMem_Malloc(n + 2); +#endif if (ret) { strncpy(ret, line, n); free(line); @@ -73,7 +81,7 @@ PyMODINIT_FUNC initlldb_readline(void) { #if PY_MAJOR_VERSION >= 3 return PyModule_Create(&readline_module); #else - Py_InitModule4("lldb_readline", moduleMethods, moduleDocumentation, + Py_InitModule4("readline", moduleMethods, moduleDocumentation, static_cast<PyObject *>(NULL), PYTHON_API_VERSION); #endif } |