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
........

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__
 /*