ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

A bit more _MSC_VER cleanup. 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2100 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
magumagu9 2009-02-04 01:55:24 +00:00
parent ec39c45dd5
commit 4307803090
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Core/Core/Src/IPC_HLE/l2cap.h
View File

@ -31,13 +31,13 @@ typedef unsigned short __u16;
typedef unsigned char __u8; typedef unsigned char __u8;
typedef unsigned long __u32; typedef unsigned long __u32;
#define __attribute__(a)
#pragma pack(push) #pragma pack(push)
#pragma pack(1) #pragma pack(1)
#ifdef _MSC_VER
#pragma warning(push) #pragma warning(push)
#pragma warning(disable:4200) #pragma warning(disable:4200)
#endif
/* L2CAP defaults */ /* L2CAP defaults */
#define L2CAP_DEFAULT_MTU 672 #define L2CAP_DEFAULT_MTU 672
@ -172,7 +172,7 @@ struct l2cap_conf_rfc {
__le16 retrans_timeout; __le16 retrans_timeout;
__le16 monitor_timeout; __le16 monitor_timeout;
__le16 max_pdu_size; __le16 max_pdu_size;
} __attribute__ ((packed)); };
#define L2CAP_MODE_BASIC 0x00 #define L2CAP_MODE_BASIC 0x00
#define L2CAP_MODE_RETRANS 0x01 #define L2CAP_MODE_RETRANS 0x01

2
Source/Plugins/Plugin_Wiimote/Src/wiimote_hid.h
View File

@ -20,7 +20,9 @@
#include <CommonTypes.h> #include <CommonTypes.h>
#ifdef _MSC_VER
#pragma warning(disable:4200) #pragma warning(disable:4200)
#endif
#pragma pack(push, 1) #pragma pack(push, 1)
// Source: HID_010_SPC_PFL/1.0 (official HID specification) // Source: HID_010_SPC_PFL/1.0 (official HID specification)