From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HYJmB-00052n-QT
	for qemu-devel@nongnu.org; Mon, 02 Apr 2007 06:28:39 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HYJmA-00052b-Nu
	for qemu-devel@nongnu.org; Mon, 02 Apr 2007 06:28:39 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HYJmA-00052Y-Kd
	for qemu-devel@nongnu.org; Mon, 02 Apr 2007 06:28:38 -0400
Received: from kurt.tools.de ([192.76.135.70])
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60)
	(envelope-from <jk@tools.de>) id 1HYJj8-00061j-MT
	for qemu-devel@nongnu.org; Mon, 02 Apr 2007 06:25:30 -0400
Received: from imap.tools.intra (imap.tools.intra [172.20.0.17])
	by kurt.TooLs.DE (Postfix) with ESMTP id 5BA05C643
	for <qemu-devel@nongnu.org>; Mon,  2 Apr 2007 12:25:26 +0200 (MEST)
Received: from tiger2.tools.intra (tiger2.tools.intra [172.20.0.11])
	by imap.tools.intra (8.13.6+Sun/8.13.6) with SMTP id l32APPUX024888
	for <qemu-devel@nongnu.org>; Mon, 2 Apr 2007 12:25:25 +0200 (CEST)
Message-Id: <200704021025.l32APPUX024888@imap.tools.intra>
Date: Mon, 2 Apr 2007 12:25:23 +0200 (CEST)
From: Juergen Keil <jk@tools.de>
Subject: Re: [Qemu-devel] Patch: dyngen-exec.h for OpenBSD
MIME-Version: 1.0
Content-Type: TEXT/plain; charset=us-ascii
Content-MD5: KdHh6VVze4kHnmjgJrA8ZA==
Reply-To: Juergen Keil <jk@tools.de>, qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org


> From: Thiemo Seufer <ths@networkno.de>
> Todd T. Fries wrote:
> > This is relative to the 20070319 snapshot.
> > 
> > 
> > --- dyngen-exec.h.orig	Mon Feb  5 17:01:54 2007
> > +++ dyngen-exec.h	Sat Mar 10 16:39:39 2007
...
> >  /* XXX: This may be wrong for 64-bit ILP32 hosts.  */
> >  typedef void * host_reg_t;
> > @@ -78,11 +83,15 @@ typedef void * host_reg_t;
> >  #define UINT32_MAX		(4294967295U)
> >  #define UINT64_MAX		((uint64_t)(18446744073709551615))
> >  
> > +#ifdef __OpenBSD__
> > +typedef struct __sFILE FILE;
> > +#else
> >  typedef struct FILE FILE;
> >  extern int fprintf(FILE *, const char *, ...);
> >  extern int printf(const char *, ...);
> >  #undef NULL
> >  #define NULL 0
> > +#endif
> 
> Shouldn't this cover only the FILE typedef?

Probably.

My dyngen-exec.h has a similar change, when I made some NetBSD experiments:

Index: dyngen-exec.h
===================================================================
RCS file: /cvsroot/qemu/qemu/dyngen-exec.h,v
retrieving revision 1.33
diff -u -B -r1.33 dyngen-exec.h
--- dyngen-exec.h       30 Mar 2007 16:44:53 -0000      1.33
+++ dyngen-exec.h       2 Apr 2007 09:42:03 -0000
@@ -78,7 +78,11 @@
 #define UINT32_MAX             (4294967295U)
 #define UINT64_MAX             ((uint64_t)(18446744073709551615))

+#ifdef __NetBSD__
+typedef struct __sFILE FILE;
+#else
 typedef struct FILE FILE;
+#endif
 extern int fprintf(FILE *, const char *, ...);
 extern int fputs(const char *, FILE *);
 extern int printf(const char *, ...);