From: Joachim Schmitz <jojo@schmitz-digital.de>
Date: Wed, 22 Aug 2012 19:59:03 GMT
Subject: RE: [PATCH] Support non-WIN32 system lacking poll() while keeping the WIN32 part intact
Message-ID: <004301cd80a0$94fddc00$bef99400$@schmitz-digital.de>
In-Reply-To: <7vd32ialzo.fsf@alter.siamese.dyndns.org>

> From: Joachim Schmitz [mailto:jojo@schmitz-digital.de]
> Sent: Wednesday, August 22, 2012 7:44 PM
> To: 'Junio C Hamano'
> Cc: 'git@vger.kernel.org'; 'Erik Faye-Lund'; 'Johannes Sixt'; 'Marius
Storm-
> Olsen'
> Subject: RE: [PATCH] Support non-WIN32 system lacking poll() while keeping
> the WIN32 part intact
> 
> > From: Junio C Hamano [mailto:gitster@pobox.com]
> > Sent: Wednesday, August 22, 2012 7:13 PM
> > To: Joachim Schmitz
> > Cc: git@vger.kernel.org; Erik Faye-Lund; Johannes Sixt; Marius
> > Storm-Olsen
> > Subject: Re: [PATCH] Support non-WIN32 system lacking poll() while
> > keeping the WIN32 part intact
> >
> > "Joachim Schmitz" <jojo@schmitz-digital.de> writes:
> >
> > > Signed-off-by: Joachim Schmitz <jojo@schmitz-digital.de>
> > > ---
> > >  Makefile            | 18 ++++++++++++++----
> > >  compat/win32/poll.c |  8 ++++++--
> > >  2 files changed, 20 insertions(+), 6 deletions(-)
> > >
> > > diff --git a/Makefile b/Makefile
...
> > > @@ -1601,6 +1606,11 @@ ifdef NO_GETTEXT ...
> > > +ifdef NO_POLL
> > > +       NO_SYS_POLL_H = YesPlease
> > > +       COMPAT_CFLAGS += -DNO_POLL -Icompat/win32 # so it find poll.h
> > > +       COMPAT_OBJS += compat/win32/poll.c

This is of course wrong! Needs to be poll.o, not poll.c

> > > endif
> >
> > In general, I think this is a good direction to go.  If the existing
> > emulation in win32/poll.c turns out to be usable across platforms and
> > not windows specific, sharing it would be a good idea.
> >
> > But if the emulation is no longer windows specific, shouldn't you also
> > move it outside compat/win32/ and somewhere more generic?
> 
> Should be possible. Esp. as with the current setup make issues a warning:
> 
> Makefile:2329: target `compat/win32/poll.c' doesn't match the target
pattern
> 
> Haven't yet been able to spot where that comes from.

See above.