diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 8 | ||||
| -rw-r--r-- | src/callproc.c | 1 | ||||
| -rw-r--r-- | src/emacs.c | 1 | ||||
| -rw-r--r-- | src/filelock.c | 1 | ||||
| -rw-r--r-- | src/w32.c | 2 |
5 files changed, 13 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 07285d564b2..9eb7b5b862a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -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). diff --git a/src/callproc.c b/src/callproc.c index 3e70b1c2e49..369d6eda909 100644 --- a/src/callproc.c +++ b/src/callproc.c @@ -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 */ diff --git a/src/emacs.c b/src/emacs.c index e4412e2ea1a..edf98d8cdb5 100644 --- a/src/emacs.c +++ b/src/emacs.c @@ -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 diff --git a/src/filelock.c b/src/filelock.c index 1fcd2432484..6e939f271d7 100644 --- a/src/filelock.c +++ b/src/filelock.c @@ -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 diff --git a/src/w32.c b/src/w32.c index 46aebe8b634..1a3d81bbffc 100644 --- a/src/w32.c +++ b/src/w32.c @@ -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); + |