Hi > From: Matthew Green <m...@netbsd.org> > > Move the define of FD_SETSIZE before the include of select.h, so that > is actually does something useful. > > Signed-off-by: Thomas Klausner <w...@netbsd.org> > --- > Xpoll.h.in | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/Xpoll.h.in b/Xpoll.h.in > index 01be164..6716e8b 100644 > --- a/Xpoll.h.in > +++ b/Xpoll.h.in > @@ -54,6 +54,12 @@ from The Open Group. > > #ifndef USE_POLL > > +#define XFD_SETSIZE 512
It's probably a question for the xproto maintainers here, but I wonder, do we really want to keep a duplicate definition XFD_SETSIZE for WIN32 and the rest like we do now? It's currently a different value but it's a gross oversight on my part in my previous patch to bump XFD_SETSIZE to 512. If not then I would even go a step further and move that define before the "#if !defined(WIN32) || defined(__CYGWIN__)" above and remove the duplicate definition of XFD_SETSIZE just after the "#else /* WIN32 */". Unless of course we really want to keep the value for WIN32 different. > + > +#ifndef FD_SETSIZE > +#define FD_SETSIZE XFD_SETSIZE > +#endif > + > #include <X11/Xos.h> > > #include <sys/select.h> /* Get the FD_* macros. */ > @@ -67,12 +73,6 @@ typedef long fd_mask; > # endif > #endif > > -#define XFD_SETSIZE 512 > - > -#ifndef FD_SETSIZE > -#define FD_SETSIZE XFD_SETSIZE > -#endif > - > #ifndef NBBY > #define NBBY 8 /* number of bits in a byte */ > #endif > -- > 2.4.5 Cheers, Olivier _______________________________________________ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
