|
222
|
1 |
--- openobex-1.3/lib/obex_header.h.orig 2007-04-02 20:46:55.462166000 -0400
|
|
|
2 |
+++ openobex-1.3/lib/obex_header.h 2007-04-02 20:47:45.697522000 -0400
|
|
|
3 |
@@ -39,7 +39,7 @@
|
|
|
4 |
#define OBEX_BYTE 0x80
|
|
|
5 |
#define OBEX_INT 0xc0
|
|
|
6 |
|
|
|
7 |
-#ifdef _WIN32
|
|
|
8 |
+#if defined (_WIN32) || defined (__SUNPRO_C)
|
|
|
9 |
#ifndef PACKED
|
|
|
10 |
#define PACKED
|
|
|
11 |
#endif
|
|
|
12 |
@@ -49,7 +49,7 @@
|
|
|
13 |
|
|
|
14 |
/* Common header used by all frames */
|
|
|
15 |
|
|
|
16 |
-#ifdef _WIN32
|
|
|
17 |
+#if defined (_WIN32) || defined (__SUNPRO_C)
|
|
|
18 |
#pragma pack(1)
|
|
|
19 |
#endif /* _WIN32 */
|
|
|
20 |
struct obex_common_hdr {
|
|
|
21 |
@@ -61,7 +61,7 @@
|
|
|
22 |
typedef struct obex_common_hdr obex_common_hdr_t;
|
|
|
23 |
|
|
|
24 |
/* Connect header */
|
|
|
25 |
-#ifdef _WIN32
|
|
|
26 |
+#if defined (_WIN32) || defined (__SUNPRO_C)
|
|
|
27 |
#pragma pack(1)
|
|
|
28 |
#endif /* _WIN32 */
|
|
|
29 |
struct obex_connect_hdr {
|
|
|
30 |
@@ -71,7 +71,7 @@
|
|
|
31 |
} PACKED;
|
|
|
32 |
typedef struct obex_connect_hdr obex_connect_hdr_t;
|
|
|
33 |
|
|
|
34 |
-#ifdef _WIN32
|
|
|
35 |
+#if defined (_WIN32) || defined (__SUNPRO_C)
|
|
|
36 |
#pragma pack(1)
|
|
|
37 |
#endif /* _WIN32 */
|
|
|
38 |
struct obex_uint_hdr {
|
|
|
39 |
@@ -79,7 +79,7 @@
|
|
|
40 |
uint32_t hv;
|
|
|
41 |
} PACKED;
|
|
|
42 |
|
|
|
43 |
-#ifdef _WIN32
|
|
|
44 |
+#if defined (_WIN32) || defined (__SUNPRO_C)
|
|
|
45 |
#pragma pack(1)
|
|
|
46 |
#endif /* _WIN32 */
|
|
|
47 |
struct obex_ubyte_hdr {
|
|
606
|
48 |
@@ -87,7 +87,7 @@
|
|
222
|
49 |
uint8_t hv;
|
|
|
50 |
} PACKED;
|
|
|
51 |
|
|
|
52 |
-#ifdef _WIN32
|
|
|
53 |
+#if defined (_WIN32) || defined (__SUNPRO_C)
|
|
|
54 |
#pragma pack(1)
|
|
|
55 |
#endif /* _WIN32 */
|
|
|
56 |
struct obex_unicode_hdr {
|