From 4307803090e6d6b866ab825819261e42d4174716 Mon Sep 17 00:00:00 2001 From: magumagu9 Date: Wed, 4 Feb 2009 01:55:24 +0000 Subject: [PATCH] A bit more _MSC_VER cleanup. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2100 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/Core/Src/IPC_HLE/l2cap.h | 8 ++++---- Source/Plugins/Plugin_Wiimote/Src/wiimote_hid.h | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Source/Core/Core/Src/IPC_HLE/l2cap.h b/Source/Core/Core/Src/IPC_HLE/l2cap.h index 97ebfe571b..5c4f8df870 100644 --- a/Source/Core/Core/Src/IPC_HLE/l2cap.h +++ b/Source/Core/Core/Src/IPC_HLE/l2cap.h @@ -31,13 +31,13 @@ typedef unsigned short __u16; typedef unsigned char __u8; typedef unsigned long __u32; - -#define __attribute__(a) #pragma pack(push) #pragma pack(1) + +#ifdef _MSC_VER #pragma warning(push) #pragma warning(disable:4200) - +#endif /* L2CAP defaults */ #define L2CAP_DEFAULT_MTU 672 @@ -172,7 +172,7 @@ struct l2cap_conf_rfc { __le16 retrans_timeout; __le16 monitor_timeout; __le16 max_pdu_size; -} __attribute__ ((packed)); +}; #define L2CAP_MODE_BASIC 0x00 #define L2CAP_MODE_RETRANS 0x01 diff --git a/Source/Plugins/Plugin_Wiimote/Src/wiimote_hid.h b/Source/Plugins/Plugin_Wiimote/Src/wiimote_hid.h index f6882a84c9..ad58653a2c 100644 --- a/Source/Plugins/Plugin_Wiimote/Src/wiimote_hid.h +++ b/Source/Plugins/Plugin_Wiimote/Src/wiimote_hid.h @@ -20,7 +20,9 @@ #include +#ifdef _MSC_VER #pragma warning(disable:4200) +#endif #pragma pack(push, 1) // Source: HID_010_SPC_PFL/1.0 (official HID specification)