|
326
|
1 |
--- openobex-1.3/lib/usbobex.h.orig 2007-04-02 21:07:51.235683000 -0400
|
|
|
2 |
+++ openobex-1.3/lib/usbobex.h 2007-04-02 21:14:08.171260000 -0400
|
|
|
3 |
@@ -56,8 +56,22 @@
|
|
|
4 |
usb_dev_handle *dev_data; /* libusb handler for data interface */
|
|
|
5 |
};
|
|
|
6 |
|
|
|
7 |
+#ifdef __sun
|
|
|
8 |
+#include <sys/types.h>
|
|
|
9 |
+#define u_int8_t uint8_t
|
|
|
10 |
+#endif
|
|
|
11 |
+
|
|
|
12 |
+#ifdef __SUNPRO_C
|
|
|
13 |
+#define PACKED
|
|
|
14 |
+#else
|
|
|
15 |
+#define PACKED __attribute__ ((packed))
|
|
|
16 |
+#endif
|
|
|
17 |
+
|
|
|
18 |
/* "Union Functional Descriptor" from CDC spec 5.2.3.X
|
|
|
19 |
* used to find data/slave OBEX interface */
|
|
|
20 |
+#ifdef __SUNPRO_C
|
|
|
21 |
+#pragma pack(1)
|
|
|
22 |
+#endif
|
|
|
23 |
struct cdc_union_desc {
|
|
|
24 |
u_int8_t bLength;
|
|
|
25 |
u_int8_t bDescriptorType;
|
|
|
26 |
@@ -65,7 +79,7 @@
|
|
|
27 |
|
|
|
28 |
u_int8_t bMasterInterface0;
|
|
|
29 |
u_int8_t bSlaveInterface0;
|
|
|
30 |
-} __attribute__ ((packed));
|
|
|
31 |
+} PACKED;
|
|
|
32 |
|
|
|
33 |
/* CDC class and subclass types */
|
|
|
34 |
#define USB_CDC_CLASS 0x02
|