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 @@
+2013-07-07  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Port to Ubuntu 10 (Bug#14803).
+        Problem reported by T.V. Raman.
+        * process.c (close_on_exec, accept4, process_socket):
+        Define these if !HAVE_ACCEPT4, not if !SOCK_CLOEXEC.
+
 2013-07-07  Eli Zaretskii  <eliz@gnu.org>
 
         * 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 *,
 
 #ifndef SOCK_CLOEXEC
 # define SOCK_CLOEXEC 0
+#endif
+
+#ifndef HAVE_ACCEPT4
 
 /* Emulate GNU/Linux accept4 and socket well enough for this module.  */