aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2014-06-04 00:00:40 +0300
committerEli Zaretskii2014-06-04 00:00:40 +0300
commit71b2605c959c8ccc6eb54ae147f98105dce369cb (patch)
tree0ea6c9b99f693193b15158b683b0cdbd13fa716e /src
parent86caa902c4beba4856d289503ed6cb131136569b (diff)
downloademacs-71b2605c959c8ccc6eb54ae147f98105dce369cb.tar.gz
emacs-71b2605c959c8ccc6eb54ae147f98105dce369cb.zip
Fix the MS-Windows build broken by few last commits.
src/sysselect.h (fd_CLR, fd_ISSET, fd_SET, FD_CLR, FD_ISSET) (FD_SET): Don't define on WINDOWSNT.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/sysselect.h3
2 files changed, 8 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 3d7f906ee29..5707c6e56f5 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12014-06-03 Eli Zaretskii <eliz@gnu.org>
2
3 * sysselect.h (fd_CLR, fd_ISSET, fd_SET, FD_CLR, FD_ISSET)
4 (FD_SET): Don't define on WINDOWSNT.
5
12014-06-03 Paul Eggert <eggert@cs.ucla.edu> 62014-06-03 Paul Eggert <eggert@cs.ucla.edu>
2 7
3 * emacs.c: Include "sysselect.h", to define its inline functions. 8 * emacs.c: Include "sysselect.h", to define its inline functions.
diff --git a/src/sysselect.h b/src/sysselect.h
index 9ecc96e310c..db6438ed1f8 100644
--- a/src/sysselect.h
+++ b/src/sysselect.h
@@ -51,6 +51,7 @@ typedef int fd_set;
51#define pselect sys_select 51#define pselect sys_select
52#endif 52#endif
53 53
54#ifndef WINDOWSNT
54INLINE_HEADER_BEGIN 55INLINE_HEADER_BEGIN
55 56
56/* Check for out-of-range errors if ENABLE_CHECKING is defined. */ 57/* Check for out-of-range errors if ENABLE_CHECKING is defined. */
@@ -85,4 +86,6 @@ fd_SET (int fd, fd_set *set)
85 86
86INLINE_HEADER_END 87INLINE_HEADER_END
87 88
89#endif /* !WINDOWSNT */
90
88#endif 91#endif