diff options
Diffstat (limited to 'include/usbmuxd-proto.h')
| -rw-r--r-- | include/usbmuxd-proto.h | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/include/usbmuxd-proto.h b/include/usbmuxd-proto.h index a2a731e..d004232 100644 --- a/include/usbmuxd-proto.h +++ b/include/usbmuxd-proto.h @@ -26,7 +26,7 @@ #include <stdint.h> #define USBMUXD_PROTOCOL_VERSION 0 -#if defined(WIN32) || defined(__CYGWIN__) +#if defined(_WIN32) || defined(__CYGWIN__) #define USBMUXD_SOCKET_PORT 27015 #else #define USBMUXD_SOCKET_FILE "/var/run/usbmuxd" @@ -57,28 +57,30 @@ enum usbmuxd_msgtype { MESSAGE_PLIST = 8, }; +#pragma pack(push, 1) + struct usbmuxd_header { uint32_t length; // length of message, including header uint32_t version; // protocol version uint32_t message; // message type uint32_t tag; // responses to this query will echo back this tag -} __attribute__((__packed__)); +}; struct usbmuxd_result_msg { struct usbmuxd_header header; uint32_t result; -} __attribute__((__packed__)); +}; struct usbmuxd_connect_request { struct usbmuxd_header header; uint32_t device_id; uint16_t port; // TCP port number uint16_t reserved; // set to zero -} __attribute__((__packed__)); +}; struct usbmuxd_listen_request { struct usbmuxd_header header; -} __attribute__((__packed__)); +}; struct usbmuxd_device_record { uint32_t device_id; @@ -86,7 +88,9 @@ struct usbmuxd_device_record { char serial_number[256]; uint16_t padding; uint32_t location; -} __attribute__((__packed__)); +}; + +#pragma pack(pop) #ifdef __cplusplus } |