Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(174)

Unified Diff: ports/python/nacl.patch

Issue 1066763002: Don't use select() in interactive python shell (Closed) Base URL: https://chromium.googlesource.com/external/naclports.git@master
Patch Set: Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ports/python3/nacl.patch » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ports/python/nacl.patch
diff --git a/ports/python/nacl.patch b/ports/python/nacl.patch
index 674bd350c9c1fb1ce66d19ad4d9e2ea7a6b31bc2..0f6d0641d4d534ac9b6a58b0ca127bb53880b78a 100644
--- a/ports/python/nacl.patch
+++ b/ports/python/nacl.patch
@@ -409,7 +409,7 @@ diff --git a/Modules/python.c b/Modules/python.c
int
main(int argc, char **argv)
{
-@@ -20,5 +43,9 @@ main(int argc, char **argv)
+@@ -20,5 +49,9 @@ main(int argc, char **argv)
m = fpgetmask();
fpsetmask(m & ~FP_X_OFL);
#endif
@@ -419,6 +419,23 @@ diff --git a/Modules/python.c b/Modules/python.c
+#endif
return Py_Main(argc, argv);
}
+diff --git a/Modules/readline.c b/Modules/readline.c
+--- a/Modules/readline.c
++++ b/Modules/readline.c
+@@ -950,7 +950,12 @@ setup_readline(void)
+ /* Wrapper around GNU readline that handles signals differently. */
+
+
+-#if defined(HAVE_RL_CALLBACK) && defined(HAVE_SELECT)
++/*
++ * Don't use the select()-based readline under Native Client. While select()
++ * is available and compile and link time it will fail at runtime under sel_ldr
++ * since there is no IRT/syscall implemenation of select().
++ */
++#if defined(HAVE_RL_CALLBACK) && defined(HAVE_SELECT) && !defined(__native_client__)
+
+ static char *completed_input_string;
+ static void
diff --git a/Modules/timemodule.c b/Modules/timemodule.c
--- a/Modules/timemodule.c
+++ b/Modules/timemodule.c
« no previous file with comments | « no previous file | ports/python3/nacl.patch » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698