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

removed more MSV_VER 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2095 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
nakeee 2009-02-03 22:46:18 +00:00
parent a1b7a91348
commit 9981670e37
3 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_WiiMote.cpp
View File

@ -28,9 +28,7 @@
#include "l2cap.h" // Local #include "l2cap.h" // Local
#include "WiiMote_HID_Attr.h" #include "WiiMote_HID_Attr.h"
#if defined(_MSC_VER)
#pragma pack(push, 1) #pragma pack(push, 1)
#endif
#define SDP_CHANNEL 0x01 #define SDP_CHANNEL 0x01
#define HIDP_CONTROL_CHANNEL 0x11 #define HIDP_CONTROL_CHANNEL 0x11
@ -131,9 +129,7 @@ struct SL2CAP_CommandDisconnectionResponse // 0x07
u16 scid; u16 scid;
}; };
#if defined(_MSC_VER)
#pragma pack(pop) #pragma pack(pop)
#endif
static CWII_IPC_HLE_Device_usb_oh1_57e_305* s_Usb; static CWII_IPC_HLE_Device_usb_oh1_57e_305* s_Usb;

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

@ -31,10 +31,11 @@ typedef unsigned short __u16;
typedef unsigned char __u8; typedef unsigned char __u8;
typedef unsigned long __u32; typedef unsigned long __u32;
#ifdef _MSC_VER
#define __attribute__(a) #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 #endif

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

@ -22,9 +22,10 @@
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(disable:4200) #pragma warning(disable:4200)
#pragma pack(push, 1)
#endif #endif
#pragma pack(push, 1)
// Source: HID_010_SPC_PFL/1.0 (official HID specification) // Source: HID_010_SPC_PFL/1.0 (official HID specification)
struct hid_packet { struct hid_packet {
@ -301,8 +302,6 @@ struct accel_cal
}; };
#if defined(_MSC_VER) #pragma pack(pop)
#pragma pack(pop)
#endif
#endif //WIIMOTE_HID_H #endif //WIIMOTE_HID_H