Mercurial > hg > octave-nkf > gnulib-hg
changeset 15822:c1b5752b5e8d
sys_select: Fix compilation error on mingw.
* lib/sys_select.in.h: On native Windows, include <io.h>.
| author | Bruno Haible <bruno@clisp.org> |
|---|---|
| date | Tue, 04 Oct 2011 02:32:48 +0200 |
| parents | 89be63167189 |
| children | cc69a672efa3 |
| files | ChangeLog lib/sys_select.in.h |
| diffstat | 2 files changed, 14 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2011-10-03 Bruno Haible <bruno@clisp.org> + + sys_select: Fix compilation error on mingw. + * lib/sys_select.in.h: On native Windows, include <io.h>. + 2011-10-03 Bruno Haible <bruno@clisp.org> wmemset: Support for MSVC.
--- a/lib/sys_select.in.h +++ b/lib/sys_select.in.h @@ -95,11 +95,15 @@ # include <string.h> # endif /* On native Windows platforms: - Get the 'fd_set' type. */ -# if @HAVE_WINSOCK2_H@ && !defined _GL_INCLUDING_WINSOCK2_H -# define _GL_INCLUDING_WINSOCK2_H -# include <winsock2.h> -# undef _GL_INCLUDING_WINSOCK2_H + Get the 'fd_set' type. + Get the close() declaration before we override it. */ +# if @HAVE_WINSOCK2_H@ +# if !defined _GL_INCLUDING_WINSOCK2_H +# define _GL_INCLUDING_WINSOCK2_H +# include <winsock2.h> +# undef _GL_INCLUDING_WINSOCK2_H +# endif +# include <io.h> # endif #endif