From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([208.118.235.92]:48188)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <pbonzini@redhat.com>) id 1UKvAy-0004ct-1q
	for qemu-devel@nongnu.org; Wed, 27 Mar 2013 14:34:25 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <pbonzini@redhat.com>) id 1UKvAw-00089P-OH
	for qemu-devel@nongnu.org; Wed, 27 Mar 2013 14:34:20 -0400
Received: from mx4-phx2.redhat.com ([209.132.183.25]:46175)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <pbonzini@redhat.com>) id 1UKvAw-00089F-HP
	for qemu-devel@nongnu.org; Wed, 27 Mar 2013 14:34:18 -0400
Date: Wed, 27 Mar 2013 14:34:17 -0400 (EDT)
From: Paolo Bonzini <pbonzini@redhat.com>
Message-ID: <933633532.16187989.1364409257248.JavaMail.root@redhat.com>
In-Reply-To: <BLU0-SMTP22C86703BCC19C625CB901B9D10@phx.gbl>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
Subject: Re: [Qemu-devel] [patch]Make GTK build on OS X
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: "C.W. Betts" <computers57@hotmail.com>
Cc: qemu-devel@nongnu.org



----- Messaggio originale -----
> Da: "C.W. Betts" <computers57@hotmail.com>
> A: "Paolo Bonzini" <pbonzini@redhat.com>
> Cc: qemu-devel@nongnu.org
> Inviato: Mercoled=C3=AC, 27 marzo 2013 19:05:46
> Oggetto: Re: [patch]Make GTK build on OS X
>=20
>=20
> On Mar 27, 2013, at 2:34 AM, Paolo Bonzini <pbonzini@redhat.com>
> wrote:
>=20
> > Il 26/03/2013 23:16, C.W. Betts ha scritto:
> >> This patch makes the GTK UI build on OS X by including the right
> >> headers.
> >>=20
> >>=20
> >>=20
> >> From b5cc84343f479d4870961c82fc7b384637e9616c Mon Sep 17 00:00:00
> >> 2001
> >> From: "C.W. Betts" <computers57@hotmail.com>
> >> Date: Sun, 24 Mar 2013 11:24:05 -0600
> >> Subject: [PATCH 1/3] Make the GTK UI build on OS X.
> >>=20
> >> ---
> >> ui/gtk.c | 5 +++++
> >> 1 file changed, 5 insertions(+)
> >>=20
> >> diff --git a/ui/gtk.c b/ui/gtk.c
> >> index 305940d..e2948d7 100644
> >> --- a/ui/gtk.c
> >> +++ b/ui/gtk.c
> >> @@ -54,7 +54,12 @@
> >> #include <sys/socket.h>
> >> #include <sys/un.h>
> >> #include <sys/wait.h>
> >> +#ifdef __APPLE__
> >> +#include <termios.h>
> >> +#include <util.h>
> >> +#else
> >> #include <pty.h>
> >> +#endif
> >> #include <math.h>
> >>=20
> >> #include "ui/console.h"
> >>=20
> >=20
> > termios.h can be included unconditionally.  For util.h and pty.h,
> > there
> > is already similar code in qemu-char.c:
> the pty.h include was already there

Yes, I know.  The point is that there's already an idiom to choose
between pty.h/util.h/libutil.h, and we should not introduce another.

Paolo

> >=20
> > #if defined(__GLIBC__)
> > #include <pty.h>
> > #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) ||
> > defined(__DragonFly__)
> > #include <libutil.h>
> > #else
> > #include <util.h>
> > #endif
> >=20
> > Please move it to include/qemu-common.h instead so that there is no
> > duplication.
> The next patch will do this. Thank you for the feedback.
> >=20
> > Paolo
> >=20
>=20
>=20