From mboxrd@z Thu Jan  1 00:00:00 1970
From: Christoph Egger <Christoph.Egger@amd.com>
Subject: Re: [PATCH 1/6] libxl: portiblity fixes
Date: Wed, 28 Jul 2010 11:49:10 +0200
Message-ID: <201007281149.11259.Christoph.Egger@amd.com>
References: <201007201831.21416.Christoph.Egger@amd.com>
	<201007271415.17649.Christoph.Egger@amd.com>
	<19535.2524.235081.800059@mariner.uk.xensource.com>
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="Boundary-00=_X0/TMzOrS9w1TAL"
Return-path: <xen-devel-bounces@lists.xensource.com>
In-Reply-To: <19535.2524.235081.800059@mariner.uk.xensource.com>
List-Unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xensource.com>
List-Help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-Subscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
Sender: xen-devel-bounces@lists.xensource.com
Errors-To: xen-devel-bounces@lists.xensource.com
To: Ian Jackson <Ian.Jackson@eu.citrix.com>
Cc: "xen-devel@lists.xensource.com" <xen-devel@lists.xensource.com>, Stefano Stabellini <Stefano.Stabellini@eu.citrix.com>
List-Id: xen-devel@lists.xenproject.org

--Boundary-00=_X0/TMzOrS9w1TAL
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

On Tuesday 27 July 2010 18:31:24 Ian Jackson wrote:
> Christoph Egger writes ("[Xen-devel] [PATCH 1/6] libxl: portiblity fixes"):
> >  #include <string.h>
> > -#include <pty.h>
> >  #include <unistd.h>
> >  #include <fcntl.h>
> > +#include <termios.h>
> > +#if defined(__NetBSD__) || defined(__OpenBSD__)
> > +#include <util.h>
> > +#elif defined(__linux__)
> > +#include <pty.h>
> > +#elif defined(__sun__)
> > +#include <stropts.h>
> > +#endif
>
> This should be in libxl_osdeps.h as previously discussed.

Done.

Take over portability fixes from tools/console:
include proper headers for openpty(3) and use $(UTIL_LIBS)
include termios.h for tcgetattr & co.

Signed-off-by: Christoph Egger <Christoph.Egger@amd.com>

-- 
---to satisfy European Law for business letters:
Advanced Micro Devices GmbH
Einsteinring 24, 85609 Dornach b. Muenchen
Geschaeftsfuehrer: Alberto Bozzo, Andrew Bowd
Sitz: Dornach, Gemeinde Aschheim, Landkreis Muenchen
Registergericht Muenchen, HRB Nr. 43632

--Boundary-00=_X0/TMzOrS9w1TAL
Content-Type: text/x-diff; charset="iso 8859-15"; name="xen_tools_libxl1.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="xen_tools_libxl1.diff"

diff -r c04dad02ffa3 tools/libxl/Makefile
--- a/tools/libxl/Makefile	Wed Jul 28 11:37:51 2010 +0200
+++ b/tools/libxl/Makefile	Wed Jul 28 11:46:52 2010 +0200
@@ -15,7 +15,7 @@ CFLAGS += -Werror -Wno-format-zero-lengt
 CFLAGS += -I. -fPIC
 CFLAGS += $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest) $(CFLAGS_libxenstore) $(CFLAGS_libblktapctl)
 
-LIBS = $(LDFLAGS_libxenctrl) $(LDFLAGS_libxenguest) $(LDFLAGS_libxenstore) $(LDFLAGS_libblktapctl) -lutil
+LIBS = $(LDFLAGS_libxenctrl) $(LDFLAGS_libxenguest) $(LDFLAGS_libxenstore) $(LDFLAGS_libblktapctl) $(UTIL_LIBS)
 
 LIBXL_OBJS-y = osdeps.o libxl_paths.o libxl_bootloader.o
 LIBXL_OBJS = flexarray.o libxl.o libxl_pci.o libxl_dom.o libxl_exec.o libxl_xshelp.o libxl_device.o libxl_internal.o xenguest.o libxl_utils.o $(LIBXL_OBJS-y)
diff -r c04dad02ffa3 tools/libxl/libxl_bootloader.c
--- a/tools/libxl/libxl_bootloader.c	Wed Jul 28 11:37:51 2010 +0200
+++ b/tools/libxl/libxl_bootloader.c	Wed Jul 28 11:46:52 2010 +0200
@@ -15,9 +15,9 @@
 #include "libxl_osdeps.h"
 
 #include <string.h>
-#include <pty.h>
 #include <unistd.h>
 #include <fcntl.h>
+#include <termios.h>
 
 #include <sys/stat.h>
 #include <sys/types.h>
diff -r c04dad02ffa3 tools/libxl/libxl_osdeps.h
--- a/tools/libxl/libxl_osdeps.h	Wed Jul 28 11:37:51 2010 +0200
+++ b/tools/libxl/libxl_osdeps.h	Wed Jul 28 11:46:52 2010 +0200
@@ -23,6 +23,14 @@
 
 #define _GNU_SOURCE
 
+#if defined(__NetBSD__) || defined(__OpenBSD__)
+#include <util.h>
+#elif defined(__linux__)
+#include <pty.h>
+#elif defined(__sun__)
+#include <stropts.h>
+#endif
+
 #ifdef NEED_OWN_ASPRINTF
 #include <stdarg.h>
 

--Boundary-00=_X0/TMzOrS9w1TAL
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel

--Boundary-00=_X0/TMzOrS9w1TAL--