diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2008-11-04 20:45:29 (GMT) |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2008-11-04 20:45:29 (GMT) |
| commit | b37509b11b34fb4b2045162b88d4fa110cd4692b (patch) | |
| tree | 7b5935107851c32929481d3f4e1e3997bdb53e82 /Modules | |
| parent | a18424c624b5720bce542d306b464660675751b0 (diff) | |
| download | cpython-b37509b11b34fb4b2045162b88d4fa110cd4692b.zip cpython-b37509b11b34fb4b2045162b88d4fa110cd4692b.tar.gz cpython-b37509b11b34fb4b2045162b88d4fa110cd4692b.tar.bz2 | |
Merged revisions 67098 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r67098 | martin.v.loewis | 2008-11-04 21:40:09 +0100 (Di, 04 Nov 2008) | 2 lines
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 8371942..22f3dc0 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; |