From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:35531)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <paolo.bonzini@gmail.com>) id 1ZMy8I-0001U1-5B
	for qemu-devel@nongnu.org; Wed, 05 Aug 2015 08:49:23 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <paolo.bonzini@gmail.com>) id 1ZMy8E-0001WE-VM
	for qemu-devel@nongnu.org; Wed, 05 Aug 2015 08:49:22 -0400
Received: from mail-wi0-x234.google.com ([2a00:1450:400c:c05::234]:34071)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <paolo.bonzini@gmail.com>) id 1ZMy8E-0001W5-Mu
	for qemu-devel@nongnu.org; Wed, 05 Aug 2015 08:49:18 -0400
Received: by wicne3 with SMTP id ne3so3386890wic.1
	for <qemu-devel@nongnu.org>; Wed, 05 Aug 2015 05:49:18 -0700 (PDT)
Sender: Paolo Bonzini <paolo.bonzini@gmail.com>
References: <1438337876-13558-1-git-send-email-berrange@redhat.com>
	<55BB6EED.2010805@redhat.com> <55BBB755.1060503@weilnetz.de>
	<20150805095246.GB16246@redhat.com> <55C1ED97.2080005@weilnetz.de>
From: Paolo Bonzini <pbonzini@redhat.com>
Message-ID: <55C2064B.2050606@redhat.com>
Date: Wed, 5 Aug 2015 14:49:15 +0200
MIME-Version: 1.0
In-Reply-To: <55C1ED97.2080005@weilnetz.de>
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
Subject: Re: [Qemu-devel] QEMU 2.4 for Windows - current status
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Stefan Weil <sw@weilnetz.de>, "Daniel P. Berrange" <berrange@redhat.com>
Cc: qemu-devel@nongnu.org



On 05/08/2015 13:03, Stefan Weil wrote:
> 
> Fix sigsetjmp for w64
> http://repo.or.cz/w/qemu/ar7.git/commit/8fa9c07c9a33174905e67589bea6be3e278712cb

Does this work too?

diff --git a/cpu-exec.c b/cpu-exec.c
index 75694f3..d882b89 100644
--- a/cpu-exec.c
+++ b/cpu-exec.c
@@ -17,6 +17,7 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 #include "config.h"
+#include "qemu-common.h"
 #include "cpu.h"
 #include "trace.h"
 #include "disas/disas.h"

> slirp: Fix non blocking connect for w32
> http://repo.or.cz/w/qemu/ar7.git/commit/b3f21d56ad3f36562d396685de8ff4981af6b805

The second looks good, but you do not need the #ifdef at all in theory.
If you do, other breakage is looming.

Paolo