Ticket #9: 620_win32-usb.patch

openobex-anoncvs

@@ -147 +147 @@
 ])
 
 AC_DEFUN([AC_PATH_USB], [
+        usb_lib_found=no
         case $host in
         *-*-mingw32*)
                 USB_CFLAGS=""
                 USB_LIBS="-lusb"
+                usb_lib_found=yes
                 ;;
         *)
-                PKG_CHECK_MODULES(USB, libusb, usb_found=yes, AC_MSG_RESULT(no))
+                PKG_CHECK_MODULES(USB, libusb, usb_lib_found=yes, AC_MSG_RESULT(no))
+                AC_CHECK_FILE(${prefix}/lib/pkgconfig/libusb.pc, REQUIRES="libusb")
                 ;;
         esac
         AC_SUBST(USB_CFLAGS)
         AC_SUBST(USB_LIBS)
-        AC_CHECK_LIB(usb, usb_get_busses, dummy=yes, AC_DEFINE(NEED_USB_GET_BUSSES, 1, [Define to 1 if you need the usb_get_busses() function.]))
-        AC_CHECK_LIB(usb, usb_interrupt_read, dummy=yes, AC_DEFINE(NEED_USB_INTERRUPT_READ, 1, [Define to 1 if you need the usb_interrupt_read() function.]))
+
+        usb_get_busses=no
+        AC_CHECK_LIB(usb, usb_get_busses, usb_get_busses=yes, AC_DEFINE(NEED_USB_GET_BUSSES, 1, [Define to 1 if you need the usb_get_busses() function.]))
+
+        usb_interrupt_read=no
+        AC_CHECK_LIB(usb, usb_interrupt_read, usb_interrupt_read=yes, AC_DEFINE(NEED_USB_INTERRUPT_READ, 1, [Define to 1 if you need the usb_interrupt_read() function.]))
+
+        if (test "$usb_lib_found" = "yes" && test "$usb_get_busses" = "yes" && test "$usb_interrupt_read" = "yes"); then
+                usb_found=yes
+        else
+                usb_found=no
+        fi
 ])
 
 AC_DEFUN([AC_PATH_GLIB], [
@@ -263 +276 @@
 
         if (test "${usb_enable}" = "yes" && test "${usb_found}" = "yes"); then
                 AC_DEFINE(HAVE_USB, 1, [Define if system supports USB and it's enabled])
-                AC_CHECK_FILE(${prefix}/lib/pkgconfig/libusb.pc, REQUIRES="libusb")
         fi
 
         AM_CONDITIONAL(GLIB, test "${glib_enable}" = "yes" && test "${glib_found}" = "yes")

openobex-anoncvs

@@ -59 +59 @@
 /* "Union Functional Descriptor" from CDC spec 5.2.3.X
  * used to find data/slave OBEX interface */
 struct cdc_union_desc {
-        u_int8_t      bLength;
-        u_int8_t      bDescriptorType;
-        u_int8_t      bDescriptorSubType;
+        uint8_t      bLength;
+        uint8_t      bDescriptorType;
+        uint8_t      bDescriptorSubType;
 
-        u_int8_t      bMasterInterface0;
-        u_int8_t      bSlaveInterface0;
+        uint8_t      bMasterInterface0;
+        uint8_t      bSlaveInterface0;
 } __attribute__ ((packed));
 
 /* CDC class and subclass types */

openobex-anoncvs

@@ -37 +37 @@
 #include <unistd.h>
 #include <stdio.h>              /* perror */
 #include <errno.h>              /* errno and EADDRNOTAVAIL */
+
+
+#ifdef _WIN32
+#include <windows.h>
+#else
 #include <netinet/in.h>
 #include <sys/socket.h>
+#endif
 
 #include <usb.h>