Re: [PATCH v3 1/4] compat/win32/sys/poll.c: upgrade from upstream

From: René Scharfe <rene.scharfe@lsrfire.ath.cx>
Date: Sep 30, 2011, 19:00 UTC
Message-ID: <4E8611B2.8030907@lsrfire.ath.cx>
In-Reply-To: <1317329963-6656-2-git-send-email-kusmabite@gmail.com>

Am 29.09.2011 22:59, schrieb Erik Faye-Lund:

Show 7 quoted lines

> poll.c is updated from revision adc3a5b in
> git://git.savannah.gnu.org/gnulib.git
> 
> The changes are applied with --whitespace=fix to reduce noise.
> 
> poll.h is not upgraded, because the most recent version now
> contains template-stuff that breaks compilation for us.

Show 9 quoted lines

> @@ -27,7 +27,10 @@
>  #include <malloc.h>
>  
>  #include <sys/types.h>
> -#include "poll.h"
> +
> +/* Specification.  */
> +#include <poll.h>
> +

In order to make bisecting easier, I think it's a good idea to squash in the next patch that undoes this part, i.e. simply skip this hunk and add a third non-verbatim note to the commit message.

René