diff options
| author | Paul Eggert | 2013-07-07 16:22:43 -0700 |
|---|---|---|
| committer | Paul Eggert | 2013-07-07 16:22:43 -0700 |
| commit | 9caab067d66a2de8520aab5c2b17205548631c4d (patch) | |
| tree | b9bd9219a605baaecce2f0413b1ae5306bda0182 /src | |
| parent | 5165d44a786798f59c880d23dd3569d263009b51 (diff) | |
| download | emacs-9caab067d66a2de8520aab5c2b17205548631c4d.tar.gz emacs-9caab067d66a2de8520aab5c2b17205548631c4d.zip | |
Port to Ubuntu 10.
Problem reported by T.V. Raman.
* configure.ac (accept4): New function to check for.
* src/process.c (close_on_exec, accept4, process_socket):
Define these if !HAVE_ACCEPT4, not if !SOCK_CLOEXEC.
Fixes: debbugs:14803
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 7 | ||||
| -rw-r--r-- | src/process.c | 3 |
2 files changed, 10 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index f73c94f0752..462a246f220 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,10 @@ | |||
| 1 | 2013-07-07 Paul Eggert <eggert@cs.ucla.edu> | ||
| 2 | |||
| 3 | Port to Ubuntu 10 (Bug#14803). | ||
| 4 | Problem reported by T.V. Raman. | ||
| 5 | * process.c (close_on_exec, accept4, process_socket): | ||
| 6 | Define these if !HAVE_ACCEPT4, not if !SOCK_CLOEXEC. | ||
| 7 | |||
| 1 | 2013-07-07 Eli Zaretskii <eliz@gnu.org> | 8 | 2013-07-07 Eli Zaretskii <eliz@gnu.org> |
| 2 | 9 | ||
| 3 | * w32.c (sys_dup): Declare prototype. | 10 | * w32.c (sys_dup): Declare prototype. |
diff --git a/src/process.c b/src/process.c index cad42470bc1..1c210649024 100644 --- a/src/process.c +++ b/src/process.c | |||
| @@ -137,6 +137,9 @@ extern int sys_select (int, SELECT_TYPE *, SELECT_TYPE *, SELECT_TYPE *, | |||
| 137 | 137 | ||
| 138 | #ifndef SOCK_CLOEXEC | 138 | #ifndef SOCK_CLOEXEC |
| 139 | # define SOCK_CLOEXEC 0 | 139 | # define SOCK_CLOEXEC 0 |
| 140 | #endif | ||
| 141 | |||
| 142 | #ifndef HAVE_ACCEPT4 | ||
| 140 | 143 | ||
| 141 | /* Emulate GNU/Linux accept4 and socket well enough for this module. */ | 144 | /* Emulate GNU/Linux accept4 and socket well enough for this module. */ |
| 142 | 145 | ||