procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

MS-Windows followup for 2013-07-07T18:00:14Z!eggert@cs.ucla.edu.

Browse source 
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.
This commit is contained in:
Eli Zaretskii 2013-07-07 21:48:16 +03:00
parent 067428c171
commit 1d44267275
7 changed files with 22 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
nt/ChangeLog
View file

@ -1,3 +1,8 @@
2013-07-07 Eli Zaretskii <eliz@gnu.org>
* inc/sys/socket.h (F_SETFD, O_CLOEXEC, F_DUPFD_CLOEXEC)
(FD_CLOEXEC): New macros.
2013-07-07 Paul Eggert <eggert@cs.ucla.edu>
Make file descriptors close-on-exec when possible (Bug#14803).

4
nt/inc/sys/socket.h
View file

@ -123,7 +123,11 @@ int sys_sendto (int s, const char * buf, int len, int flags,
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

8
src/ChangeLog
View file

@ -1,3 +1,11 @@
2013-07-07 Eli Zaretskii <eliz@gnu.org>
* w32.c (sys_dup): Declare prototype.
* filelock.c:
* emacs.c:
* callproc.c [WINDOWSNT]: Include sys/socket.h.
2013-07-07 Paul Eggert <eggert@cs.ucla.edu>
Make file descriptors close-on-exec when possible (Bug#14803).

1
src/callproc.c
View file

@ -31,6 +31,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#ifdef WINDOWSNT
#define NOMINMAX
#include <sys/socket.h> /* for fcntl */
#include <windows.h>
#include "w32.h"
#define _P_NOWAIT 1 /* from process.h */

1
src/emacs.c
View file

@ -34,6 +34,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#ifdef WINDOWSNT
#include <fcntl.h>
#include <sys/socket.h>
#include "w32.h"
#include "w32heap.h"
#endif

1
src/filelock.c
View file

@ -47,6 +47,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#include "systime.h"
#ifdef WINDOWSNT
#include <share.h>
#include <sys/socket.h> /* for fcntl */
#include "w32.h" /* for dostounix_filename */
#endif

2
src/w32.c
View file

@ -234,6 +234,8 @@ extern int sys_access (const char *, int);
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);