On Mar 27, 2013, at 2:34 AM, Paolo Bonzini <pbonz...@redhat.com> wrote:
> 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" <computer...@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: the pty.h include was already there > > #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. The next patch will do this. Thank you for the feedback. > > Paolo >