summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRonald Oussoren <ronaldoussoren@mac.com>2010-02-11 13:15:00 (GMT)
committerRonald Oussoren <ronaldoussoren@mac.com>2010-02-11 13:15:00 (GMT)
commit25696bb9b2bbb80fdfd1535b1f78492d8a469cb1 (patch)
treec58efe8c4afa569d2d3204f2eed3dcbf7a78fcdf
parentddb3ed003ecfd5c8d0ddc4880e0c92ac36519d93 (diff)
downloadcpython-25696bb9b2bbb80fdfd1535b1f78492d8a469cb1.zip
cpython-25696bb9b2bbb80fdfd1535b1f78492d8a469cb1.tar.gz
cpython-25696bb9b2bbb80fdfd1535b1f78492d8a469cb1.tar.bz2
Merged revisions 78148 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r78148 | ronald.oussoren | 2010-02-11 14:13:08 +0100 (Thu, 11 Feb 2010) | 3 lines Add guard around the prototype for completion_matches to enable compilition with libedit on OSX 10.5 ........
-rw-r--r--Modules/readline.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/Modules/readline.c b/Modules/readline.c
index 705d766..a3dc4d9 100644
--- a/Modules/readline.c
+++ b/Modules/readline.c
@@ -38,9 +38,12 @@
#if defined(_RL_FUNCTION_TYPEDEF)
extern char **completion_matches(char *, rl_compentry_func_t *);
#else
+
+#if !defined(__APPLE__)
extern char **completion_matches(char *, CPFunction *);
#endif
#endif
+#endif
#ifdef __APPLE__
/*