summaryrefslogtreecommitdiff
path: root/nt
diff options
context:
space:
mode:
Diffstat (limited to 'nt')
-rw-r--r--nt/ChangeLog5
-rw-r--r--nt/inc/sys/socket.h3
2 files changed, 7 insertions, 1 deletions
diff --git a/nt/ChangeLog b/nt/ChangeLog
index ebc823071a3..cf0853c7045 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,8 @@
+2013-08-26 Eli Zaretskii <eliz@gnu.org>
+
+ * inc/sys/socket.h: Include stdint.h. Include sysselect.h instead
+ of w32.h.
+
2013-08-25 Vincent Belaïche <vincentb1@users.sourceforge.net>
* configure.bat: Rather than disabling, make configure.bat produce
diff --git a/nt/inc/sys/socket.h b/nt/inc/sys/socket.h
index 93bf9f91665..02a0584820f 100644
--- a/nt/inc/sys/socket.h
+++ b/nt/inc/sys/socket.h
@@ -53,6 +53,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#include <ws2tcpip.h>
/* process.c uses uint16_t (from C99) for IPv6, but
apparently it is not defined in some versions of mingw and msvc. */
+#include <stdint.h>
#ifndef UINT16_C
typedef unsigned short uint16_t;
#endif
@@ -73,7 +74,7 @@ typedef unsigned short uint16_t;
/* allow us to provide our own version of fd_set */
#define fd_set ws_fd_set
-#include "w32.h"
+#include "sysselect.h"
#endif /* EMACS_CONFIG_H */
#if defined (HAVE_TIMEVAL) && defined (_MSC_VER)