[Xen-changelog] [xen-unstable] blktap2: <sys/time.h> is needed for 'struct timeval'

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1276063135 -3600
# Node ID bd29e8b07d514f9dcc997be56740e7b2d3c4c92a
# Parent  e86c146f5625b5ef54023e3b7e6416eca1ae8c24
blktap2: <sys/time.h> is needed for 'struct timeval'

Also clean up a Makefile to use $(SBINDIR).

Signed-off-by: Christoph Egger <Christoph.Egger@xxxxxxx>
---
 tools/blktap2/control/Makefile    |    5 ++---
 tools/blktap2/include/blktaplib.h |    1 +
 2 files changed, 3 insertions(+), 3 deletions(-)

diff -r e86c146f5625 -r bd29e8b07d51 tools/blktap2/control/Makefile
--- a/tools/blktap2/control/Makefile    Tue Jun 08 08:09:16 2010 +0100
+++ b/tools/blktap2/control/Makefile    Wed Jun 09 06:58:55 2010 +0100
@@ -2,7 +2,6 @@ include $(XEN_ROOT)/tools/Rules.mk
 include $(XEN_ROOT)/tools/Rules.mk
 
 IBIN               = tap-ctl
-INST_DIR           = /usr/sbin
 
 CFLAGS            += -Werror
 CFLAGS            += -Wno-unused
@@ -45,8 +44,8 @@ libblktapctl.a: $(CTL_OBJS)
        ar r $@ $^
 
 install: all
-       $(INSTALL_DIR) -p $(DESTDIR)$(INST_DIR)
-       $(INSTALL_PROG) $(IBIN) $(DESTDIR)$(INST_DIR)
+       $(INSTALL_DIR) -p $(DESTDIR)$(SBINDIR)
+       $(INSTALL_PROG) $(IBIN) $(DESTDIR)$(SBINDIR)
 
 clean:
        rm -f $(OBJS) $(DEPS) $(IBIN) $(LIBS)
diff -r e86c146f5625 -r bd29e8b07d51 tools/blktap2/include/blktaplib.h
--- a/tools/blktap2/include/blktaplib.h Tue Jun 08 08:09:16 2010 +0100
+++ b/tools/blktap2/include/blktaplib.h Wed Jun 09 06:58:55 2010 +0100
@@ -33,6 +33,7 @@
 #define __BLKTAPLIB_H__
 
 #include <syslog.h>
+#include <sys/time.h>
 #include <xenctrl.h>
 #include <xen/io/blkif.h>
 

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