Commit 7791dba3 authored by Paolo Bonzini's avatar Paolo Bonzini Committed by Anthony Liguori
Browse files

portability: pty.h is glibc-specific 



This should fix building the GTK+ front-end on BSDs.

Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Message-id: 1368533121-30796-1-git-send-email-pbonzini@redhat.com
Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parent d8e846e1

include/qemu-common.h

+12 −0
Original line number Diff line number Diff line
@@ -42,6 +42,18 @@ 
#include <signal.h>

#include "glib-compat.h"



#if defined(__GLIBC__)

# include <pty.h>

#elif defined CONFIG_BSD

# if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)

#  include <libutil.h>

# else

#  include <util.h>

# endif

#elif defined CONFIG_SOLARIS

# include <stropts.h>

#endif



#ifdef _WIN32

#include "sysemu/os-win32.h"

#endif

qemu-char.c

+0 −10
Original line number Diff line number Diff line
@@ -53,13 +53,6 @@ 
#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>
@@ -69,8 +62,6 @@ 
#endif

#else

#ifdef __linux__

#include <pty.h>



#include <linux/ppdev.h>

#include <linux/parport.h>

#endif
@@ -87,7 +78,6 @@ 
#include <netinet/tcp.h>

#include <net/if.h>

#include <syslog.h>

#include <stropts.h>

#endif

#endif

#endif

ui/gtk.c

+0 −1
Original line number Diff line number Diff line
@@ -55,7 +55,6 @@ 
#include <sys/socket.h>

#include <sys/un.h>

#include <sys/wait.h>

#include <pty.h>

#include <math.h>



#include "ui/console.h"