aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2014-12-29 23:02:22 +0200
committerEli Zaretskii2014-12-29 23:02:22 +0200
commit8ae52a77036340ca03f819f4bdb7738d48ce2d8c (patch)
tree1b9246612b14d75fbc6caa143339bee40326d7ac /src
parenta5e5d7773b39cd39924404d40093ba44fc0de7f8 (diff)
downloademacs-8ae52a77036340ca03f819f4bdb7738d48ce2d8c.tar.gz
emacs-8ae52a77036340ca03f819f4bdb7738d48ce2d8c.zip
Fix the MS-Windows build.
src/sysdep.c [WINDOWSNT]: Include sys/socket.h, without which this file doesn't compile on MS-Windows.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/sysdep.c3
2 files changed, 8 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 2ab5101fc6f..51e8d112c9d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12014-12-29 Eli Zaretskii <eliz@gnu.org>
2
3 * sysdep.c [WINDOWSNT]: Include sys/socket.h, without which this
4 file doesn't compile on MS-Windows.
5
12014-12-28 Paul Eggert <eggert@cs.ucla.edu> 62014-12-28 Paul Eggert <eggert@cs.ucla.edu>
2 7
3 Fix produce_composite_width typo 8 Fix produce_composite_width typo
diff --git a/src/sysdep.c b/src/sysdep.c
index 013c86b859d..7158f38dba2 100644
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -110,6 +110,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
110#define _P_WAIT 0 110#define _P_WAIT 0
111int _cdecl _spawnlp (int, const char *, const char *, ...); 111int _cdecl _spawnlp (int, const char *, const char *, ...);
112int _cdecl _getpid (void); 112int _cdecl _getpid (void);
113/* The following is needed for O_CLOEXEC, F_SETFD, FD_CLOEXEC, and
114 several prototypes of functions called below. */
115#include <sys/socket.h>
113#endif 116#endif
114 117
115#include "syssignal.h" 118#include "syssignal.h"