diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2008-11-04 20:40:09 (GMT) |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2008-11-04 20:40:09 (GMT) |
| commit | bb86d831340239e50036ef4f524bd90a727fdcd4 (patch) | |
| tree | 98dec06bdc4bd399b944537222d3fd74b628c84e /Modules | |
| parent | 81e92e582e06481f37a7ce1d23bd251316c58383 (diff) | |
| download | cpython-bb86d831340239e50036ef4f524bd90a727fdcd4.zip cpython-bb86d831340239e50036ef4f524bd90a727fdcd4.tar.gz cpython-bb86d831340239e50036ef4f524bd90a727fdcd4.tar.bz2 | |
Issue #4204: Fixed module build errors on FreeBSD 4.
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/_multiprocessing/multiprocessing.h | 2 | ||||
| -rw-r--r-- | Modules/readline.c | 8 |
2 files changed, 10 insertions, 0 deletions
diff --git a/Modules/_multiprocessing/multiprocessing.h b/Modules/_multiprocessing/multiprocessing.h index 0b32790..2bfad87 100644 --- a/Modules/_multiprocessing/multiprocessing.h +++ b/Modules/_multiprocessing/multiprocessing.h @@ -20,7 +20,9 @@ # define SEM_VALUE_MAX LONG_MAX #else # include <fcntl.h> /* O_CREAT and O_EXCL */ +# include <netinet/in.h> # include <sys/socket.h> +# include <sys/uio.h> # include <arpa/inet.h> /* htonl() and ntohl() */ # if HAVE_SEM_OPEN # include <semaphore.h> diff --git a/Modules/readline.c b/Modules/readline.c index 90904ab..f5a54bc 100644 --- a/Modules/readline.c +++ b/Modules/readline.c @@ -35,7 +35,11 @@ #define completion_matches(x, y) \ rl_completion_matches((x), ((rl_compentry_func_t *)(y))) #else +#if defined(_RL_FUNCTION_TYPEDEF) extern char **completion_matches(char *, rl_compentry_func_t *); +#else +extern char **completion_matches(char *, CPFunction *); +#endif #endif static void @@ -213,7 +217,11 @@ set_completion_display_matches_hook(PyObject *self, PyObject *args) default completion display. */ rl_completion_display_matches_hook = completion_display_matches_hook ? +#if defined(_RL_FUNCTION_TYPEDEF) (rl_compdisp_func_t *)on_completion_display_matches_hook : 0; +#else + (VFunction *)on_completion_display_matches_hook : 0; +#endif #endif return result; |