From: Bruno Haible Date: Tue, 4 Oct 2011 00:32:48 +0000 (+0200) Subject: sys_select: Fix compilation error on mingw. X-Git-Tag: v0.1~1704 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=1905965d890e9a5d096fc92dbf3b164754dcf893;p=gnulib.git sys_select: Fix compilation error on mingw. * lib/sys_select.in.h: On native Windows, include . --- diff --git a/ChangeLog b/ChangeLog index 668add3b6a..3df083868c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2011-10-03 Bruno Haible + + sys_select: Fix compilation error on mingw. + * lib/sys_select.in.h: On native Windows, include . + 2011-10-03 Bruno Haible wmemset: Support for MSVC. diff --git a/lib/sys_select.in.h b/lib/sys_select.in.h index 7d43c2782b..397508aac4 100644 --- a/lib/sys_select.in.h +++ b/lib/sys_select.in.h @@ -95,11 +95,15 @@ # include # 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 -# 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 +# undef _GL_INCLUDING_WINSOCK2_H +# endif +# include # endif #endif