# HG changeset patch
# User bartv
# Date 1218664588 0
# Node ID 901d69d75fc107968a89f14f295d86679ce5e62e
# Parent  997f0b155d3054804b681401f7032a242db4fe64
Sort out build problems.

diff --git a/packages/io/usb/slave/current/ChangeLog b/packages/io/usb/slave/current/ChangeLog
--- a/packages/io/usb/slave/current/ChangeLog
+++ b/packages/io/usb/slave/current/ChangeLog
@@ -1,3 +1,9 @@
+2008-08-13  Bart Veer  <bartv@ecoscentric.com>
+
+	* host/usbhost.c: insist on the GNU version of strerror_r().
+	Use the right header file for current Linux systems.
+	* host/usbchmod.c: avoid compiler warning.
+
 2006-05-07  Andrew Lunn  <andrew.lunn@ascom.ch>
 
 	* host/bulk-boundaries.tcl(New): test bulk transfers at
diff --git a/packages/io/usb/slave/current/host/usbchmod.c b/packages/io/usb/slave/current/host/usbchmod.c
--- a/packages/io/usb/slave/current/host/usbchmod.c
+++ b/packages/io/usb/slave/current/host/usbchmod.c
@@ -115,7 +115,8 @@ int
 main(int argc, char** argv)
 {
     int         bus, dev;
-    int         actual_bus, actual_dev;
+    int         actual_bus  = 0;
+    int         actual_dev  = 0;
     char        devname[_POSIX_PATH_MAX];
     long        strtol_tmp1;
     char*       strtol_tmp2;
diff --git a/packages/io/usb/slave/current/host/usbhost.c b/packages/io/usb/slave/current/host/usbhost.c
--- a/packages/io/usb/slave/current/host/usbhost.c
+++ b/packages/io/usb/slave/current/host/usbhost.c
@@ -67,6 +67,8 @@
 /*}}}*/
 /*{{{  #include's                                               */
 
+// To get the desired version of strerror_r()
+#define _GNU_SOURCE 1
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -84,7 +86,7 @@
 // Avoid compatibility problems with Tcl 8.4 vs. earlier
 #define USE_NON_CONST
 #include <tcl.h>
-#include <linux/usb.h>
+#include <linux/usb/ch9.h>
 #include <linux/usbdevice_fs.h>
 #include "../tests/protocol.h"
 #include "config.h"