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

jiggle includes in hci.h/l2cap.h: msvc <= 9 doesn't provide stdint.h 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6186 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Shawn Hoffman 2010-09-06 13:47:18 +00:00
parent c551a2ee51
commit 5948865bcc
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Source/Core/Core/Src/IPC_HLE/hci.h
View File

@ -79,12 +79,7 @@
#pragma once #pragma once
#include <stdint.h> // msvc >= msvc10 has stdint.h/cstdint
// All structs in this file are packed
#pragma pack(push, 1)
// This is not needed >= msvc10
#ifdef _MSC_VER #ifdef _MSC_VER
typedef u8 uint8_t; typedef u8 uint8_t;
typedef s8 int8_t; typedef s8 int8_t;
@ -92,8 +87,13 @@
typedef s16 int16_t; typedef s16 int16_t;
typedef u32 uint32_t; typedef u32 uint32_t;
typedef s32 int32_t; typedef s32 int32_t;
#else
#include <stdint.h>
#endif #endif
// All structs in this file are packed
#pragma pack(push, 1)
/* /*
* Bluetooth Address Family Protocol Numbers * Bluetooth Address Family Protocol Numbers
*/ */

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

@ -68,6 +68,18 @@
#pragma once #pragma once
// msvc >= msvc10 has stdint.h/cstdint
#ifdef _MSC_VER
typedef u8 uint8_t;
typedef s8 int8_t;
typedef u16 uint16_t;
typedef s16 int16_t;
typedef u32 uint32_t;
typedef s32 int32_t;
#else
#include <stdint.h>
#endif
/************************************************************************** /**************************************************************************
************************************************************************** **************************************************************************
** Common defines and types (L2CAP) ** Common defines and types (L2CAP)