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:
parent
c551a2ee51
commit
5948865bcc
|
@ -79,12 +79,7 @@
|
|||
|
||||
#pragma once
|
||||
|
||||
#include <stdint.h>
|
||||
|
||||
// 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 <stdint.h>
|
||||
#endif
|
||||
|
||||
// All structs in this file are packed
|
||||
#pragma pack(push, 1)
|
||||
|
||||
/*
|
||||
* Bluetooth Address Family Protocol Numbers
|
||||
*/
|
||||
|
|
|
@ -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 <stdint.h>
|
||||
#endif
|
||||
|
||||
/**************************************************************************
|
||||
**************************************************************************
|
||||
** Common defines and types (L2CAP)
|
||||
|
|
Loading…
Reference in New Issue