From 5948865bcc0ff079889bd21a69af1f5e73abd3a9 Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Mon, 6 Sep 2010 13:47:18 +0000 Subject: [PATCH] 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 --- Source/Core/Core/Src/IPC_HLE/hci.h | 12 ++++++------ Source/Core/Core/Src/IPC_HLE/l2cap.h | 12 ++++++++++++ 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/Source/Core/Core/Src/IPC_HLE/hci.h b/Source/Core/Core/Src/IPC_HLE/hci.h index 150e81a709..e95a773490 100644 --- a/Source/Core/Core/Src/IPC_HLE/hci.h +++ b/Source/Core/Core/Src/IPC_HLE/hci.h @@ -79,12 +79,7 @@ #pragma once -#include - -// All structs in this file are packed -#pragma pack(push, 1) - -// This is not needed >= msvc10 +// msvc >= msvc10 has stdint.h/cstdint #ifdef _MSC_VER typedef u8 uint8_t; typedef s8 int8_t; @@ -92,8 +87,13 @@ typedef s16 int16_t; typedef u32 uint32_t; typedef s32 int32_t; +#else + #include #endif +// All structs in this file are packed +#pragma pack(push, 1) + /* * Bluetooth Address Family Protocol Numbers */ diff --git a/Source/Core/Core/Src/IPC_HLE/l2cap.h b/Source/Core/Core/Src/IPC_HLE/l2cap.h index 5b1092c201..a3cff02187 100644 --- a/Source/Core/Core/Src/IPC_HLE/l2cap.h +++ b/Source/Core/Core/Src/IPC_HLE/l2cap.h @@ -68,6 +68,18 @@ #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 +#endif + /************************************************************************** ************************************************************************** ** Common defines and types (L2CAP)