This reverts commit 978e72d013cf12201c6c3ffc51de90e0b498f736.
---
lib/usbobex.c | 3 +--
lib/usbobex.h | 4 ++--
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/lib/usbobex.c b/lib/usbobex.c
index b12131b..3d1f619 100644
--- a/lib/usbobex.c
+++ b/lib/usbobex.c
@@ -242,11 +242,10 @@ static void find_obex_service_descriptor(unsigned char
*buffer, int buflen, obex
else if (*service == NULL) {
*service =
malloc(sizeof(obex_usb_intf_service_t));
if (*service != NULL) {
- const uint8_t default_uuid[16] =
WMC_DEFAULT_OBEX_SERVER_UUID;
(*service)->role = buffer[3];
memcpy((*service)->uuid, buffer+4, 16);
(*service)->version =
(buffer[20]<<8)|(buffer[21]);
- if (memcmp((*service)->uuid,
default_uuid, 16) == 0 )
+ if (memcmp((*service)->uuid,
WMC_DEFAULT_OBEX_SERVER_UUID, 16) == 0 )
(*service)->is_default_uuid = 1;
else
(*service)->is_default_uuid = 0;
diff --git a/lib/usbobex.h b/lib/usbobex.h
index efd7a38..f3ffbd4 100644
--- a/lib/usbobex.h
+++ b/lib/usbobex.h
@@ -82,11 +82,11 @@ struct cdc_union_desc {
#define USB_DT_CS_INTERFACE 0x24
#define CDC_DATA_INTERFACE_TYPE 0x0a
-#define WMC_DEFAULT_OBEX_SERVER_UUID \
+#define WMC_DEFAULT_OBEX_SERVER_UUID ((const uint8_t []) \
{ 0x02, 0xae, 0xb3, 0x20, \
0xf6, 0x49, 0x11, 0xda, \
0x97, 0x4d, 0x08, 0x00, \
-0x20, 0x0c, 0x9a, 0x66 }
+0x20, 0x0c, 0x9a, 0x66 } )
#define USB_MAX_STRING_SIZE 256
#define USB_OBEX_TIMEOUT 10000 /* 10 seconds */
--
1.5.6.5
------------------------------------------------------------------------------
SF.Net email is Sponsored by MIX09, March 18-20, 2009 in Las Vegas, Nevada.
The future of the web can't happen without you. Join us at MIX09 to help
pave the way to the Next Web now. Learn more and register at
http://ad.doubleclick.net/clk;208669438;13503038;i?http://2009.visitmix.com/
_______________________________________________
Openobex-users mailing list
Openobex-users@lists.sourceforge.net
http://lists.sourceforge.net/lists/listinfo/openobex-users
