[Emacs-diffs] trunk r113316: MS-Windows followup for revision 113315.

[Eli Zaretskii]

------------------------------------------------------------
revno: 113316
revision-id: address@hidden
parent: address@hidden
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Sun 2013-07-07 21:48:16 +0300
message:
  MS-Windows followup for revision 113315.
  
   nt/inc/sys/socket.h (F_SETFD, O_CLOEXEC, F_DUPFD_CLOEXEC)
   (FD_CLOEXEC): New macros.
  
   src/w32.c (sys_dup): Declare prototype.
  
   src/filelock.c:
   src/emacs.c:
   src/callproc.c [WINDOWSNT]: Include sys/socket.h.
modified:
  nt/ChangeLog                   changelog-20091113204419-o5vbwnq5f7feedwu-1545
  nt/inc/sys/socket.h            socket.h-20091113204419-o5vbwnq5f7feedwu-977
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/callproc.c                 callproc.c-20091113204419-o5vbwnq5f7feedwu-248
  src/emacs.c                    emacs.c-20091113204419-o5vbwnq5f7feedwu-241
  src/filelock.c                 filelock.c-20091113204419-o5vbwnq5f7feedwu-179
  src/w32.c                      w32.c-20091113204419-o5vbwnq5f7feedwu-808

=== modified file 'nt/ChangeLog'
--- a/nt/ChangeLog      2013-07-07 18:00:14 +0000
+++ b/nt/ChangeLog      2013-07-07 18:48:16 +0000
@@ -1,3 +1,8 @@
+2013-07-07  Eli Zaretskii  <address@hidden>
+
+       * inc/sys/socket.h (F_SETFD, O_CLOEXEC, F_DUPFD_CLOEXEC)
+       (FD_CLOEXEC): New macros.
+
 2013-07-07  Paul Eggert  <address@hidden>
 
        Make file descriptors close-on-exec when possible (Bug#14803).

=== modified file 'nt/inc/sys/socket.h'
--- a/nt/inc/sys/socket.h       2013-03-28 18:13:59 +0000
+++ b/nt/inc/sys/socket.h       2013-07-07 18:48:16 +0000
@@ -123,7 +123,11 @@
    an fcntl function, for setting sockets to non-blocking mode.  */
 int fcntl (int s, int cmd, int options);
 #define F_SETFL   4
+#define F_SETFD   2
 #define O_NONBLOCK  04000
+#define O_CLOEXEC O_NOINHERIT
+#define F_DUPFD_CLOEXEC 0x40000000
+#define FD_CLOEXEC 1
 
 /* we are providing a real h_errno variable */
 #undef h_errno

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-07-07 18:00:14 +0000
+++ b/src/ChangeLog     2013-07-07 18:48:16 +0000
@@ -1,3 +1,11 @@
+2013-07-07  Eli Zaretskii  <address@hidden>
+
+       * w32.c (sys_dup): Declare prototype.
+
+       * filelock.c:
+       * emacs.c:
+       * callproc.c [WINDOWSNT]: Include sys/socket.h.
+
 2013-07-07  Paul Eggert  <address@hidden>
 
        Make file descriptors close-on-exec when possible (Bug#14803).

=== modified file 'src/callproc.c'
--- a/src/callproc.c    2013-07-07 18:00:14 +0000
+++ b/src/callproc.c    2013-07-07 18:48:16 +0000
@@ -31,6 +31,7 @@
 
 #ifdef WINDOWSNT
 #define NOMINMAX
+#include <sys/socket.h>        /* for fcntl */
 #include <windows.h>
 #include "w32.h"
 #define _P_NOWAIT 1    /* from process.h */

=== modified file 'src/emacs.c'
--- a/src/emacs.c       2013-07-07 18:00:14 +0000
+++ b/src/emacs.c       2013-07-07 18:48:16 +0000
@@ -34,6 +34,7 @@
 
 #ifdef WINDOWSNT
 #include <fcntl.h>
+#include <sys/socket.h>
 #include "w32.h"
 #include "w32heap.h"
 #endif

=== modified file 'src/filelock.c'
--- a/src/filelock.c    2013-07-07 18:00:14 +0000
+++ b/src/filelock.c    2013-07-07 18:48:16 +0000
@@ -47,6 +47,7 @@
 #include "systime.h"
 #ifdef WINDOWSNT
 #include <share.h>
+#include <sys/socket.h>        /* for fcntl */
 #include "w32.h"       /* for dostounix_filename */
 #endif
 

=== modified file 'src/w32.c'
--- a/src/w32.c 2013-07-07 18:00:14 +0000
+++ b/src/w32.c 2013-07-07 18:48:16 +0000
@@ -234,6 +234,8 @@
 extern void *e_malloc (size_t);
 extern int sys_select (int, SELECT_TYPE *, SELECT_TYPE *, SELECT_TYPE *,
                       EMACS_TIME *, void *);
+extern int sys_dup (int);
+