Patchwork [v2.5] Make GTK UI build on OS X

login
register
mail settings
Submitter C.W. Betts
Date March 27, 2013, 6:13 p.m.
Message ID <BLU0-SMTP3724C6E6EC4634829F827F2B9D10@phx.gbl>
Download mbox | patch
Permalink /patch/231787/
State New
Headers show

Comments

C.W. Betts - March 27, 2013, 6:13 p.m.
This patch is identical to the previous, but this one is signed off.

From f9009d44e4c4c5325d960a61eadcff0d9c352ee1 Mon Sep 17 00:00:00 2001
From: "C.W. Betts" <computers57@hotmail.com>
Date: Wed, 27 Mar 2013 12:11:54 -0600
Subject: [PATCH] Make the GTK UI build on OS X. Moved the terminal includes
 from qemu-char.c to qemu-common.h. Removed the terminal includes from gtk.c.

Signed-off-by: C.W. Betts <computers57@hotmail.com>
---
 include/qemu-common.h | 8 ++++++++
 qemu-char.c           | 9 ---------
 ui/gtk.c              | 1 -
 3 files changed, 8 insertions(+), 10 deletions(-)

Patch

diff --git a/include/qemu-common.h b/include/qemu-common.h
index 31fff22..08d4b46 100644
--- a/include/qemu-common.h
+++ b/include/qemu-common.h
@@ -40,6 +40,14 @@ 
 #include <sys/time.h>
 #include <assert.h>
 #include <signal.h>
+
+#if defined(__GLIBC__)
+#include <pty.h>
+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
+#include <libutil.h>
+#else
+#include <util.h>
+#endif
 #include "glib-compat.h"
 
 #ifdef _WIN32
diff --git a/qemu-char.c b/qemu-char.c
index dee623e..f142b81 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -51,15 +51,6 @@ 
 #include <dirent.h>
 #include <netdb.h>
 #include <sys/select.h>
-#ifdef CONFIG_BSD
-#include <sys/stat.h>
-#if defined(__GLIBC__)
-#include <pty.h>
-#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
-#include <libutil.h>
-#else
-#include <util.h>
-#endif
 #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
 #include <dev/ppbus/ppi.h>
 #include <dev/ppbus/ppbconf.h>
diff --git a/ui/gtk.c b/ui/gtk.c
index a5a8156..b45706b 100644
--- a/ui/gtk.c
+++ b/ui/gtk.c
@@ -54,7 +54,6 @@ 
 #include <sys/socket.h>
 #include <sys/un.h>
 #include <sys/wait.h>
-#include <pty.h>
 #include <math.h>
 
 #include "ui/console.h"