From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([208.118.235.92]:46069)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <paolo.bonzini@gmail.com>) id 1UKlog-00087v-Ga
	for qemu-devel@nongnu.org; Wed, 27 Mar 2013 04:34:44 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <paolo.bonzini@gmail.com>) id 1UKlof-0005oI-4L
	for qemu-devel@nongnu.org; Wed, 27 Mar 2013 04:34:42 -0400
Received: from mail-ea0-x231.google.com ([2a00:1450:4013:c01::231]:36502)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <paolo.bonzini@gmail.com>) id 1UKloe-0005oC-Su
	for qemu-devel@nongnu.org; Wed, 27 Mar 2013 04:34:41 -0400
Received: by mail-ea0-f177.google.com with SMTP id q14so916222eaj.8
	for <qemu-devel@nongnu.org>; Wed, 27 Mar 2013 01:34:40 -0700 (PDT)
Sender: Paolo Bonzini <paolo.bonzini@gmail.com>
Message-ID: <5152AF1B.3000901@redhat.com>
Date: Wed, 27 Mar 2013 09:34:35 +0100
From: Paolo Bonzini <pbonzini@redhat.com>
MIME-Version: 1.0
References: <BLU0-SMTP3802FB63970D3F90FBEC132B9D00@phx.gbl>
In-Reply-To: <BLU0-SMTP3802FB63970D3F90FBEC132B9D00@phx.gbl>
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
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

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.
> 
> 
> 
> 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.
> 
> ---
>  ui/gtk.c | 5 +++++
>  1 file changed, 5 insertions(+)
> 
> 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>
>  
>  #include "ui/console.h"
> 

termios.h can be included unconditionally.  For util.h and pty.h, there
is already similar code in qemu-char.c:

#if defined(__GLIBC__)
#include <pty.h>
#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) ||
defined(__DragonFly__)
#include <libutil.h>
#else
#include <util.h>
#endif

Please move it to include/qemu-common.h instead so that there is no
duplication.

Paolo