From 9b00d84c5de72e2331801b3e029a6516b48330e8 Mon Sep 17 00:00:00 2001
From: nakeee <nakeee@gmail.com>
Date: Sun, 1 Mar 2009 12:56:07 +0000
Subject: [PATCH] Revent accidental hci.h change add better portaudio detection

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2506 8ced0084-cf51-0410-be5f-012b33b47a6e
---
 SConstruct                         |  4 +++-
 Source/Core/Core/Src/IPC_HLE/hci.h | 11 ++++++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/SConstruct b/SConstruct
index ef2bd473b5..00445da6af 100644
--- a/SConstruct
+++ b/SConstruct
@@ -206,7 +206,9 @@ env['HAVE_BLUEZ'] = conf.CheckPKG('bluez')
 env['HAVE_AO'] = conf.CheckPKG('ao')
 
 # needed for mic
-env['HAVE_PORTAUDIO'] = conf.CheckPKG('portaudio')
+env['HAVE_PORTAUDIO'] = False
+if conf.CheckPKG('portaudio') and conf.CheckCHeader("portaudio.h"):
+    env['HAVE_PORTAUDIO'] = True;
 
 #osx 64 specifics
 if sys.platform == 'darwin':
diff --git a/Source/Core/Core/Src/IPC_HLE/hci.h b/Source/Core/Core/Src/IPC_HLE/hci.h
index c746fecc89..0d10b39dc7 100644
--- a/Source/Core/Core/Src/IPC_HLE/hci.h
+++ b/Source/Core/Core/Src/IPC_HLE/hci.h
@@ -1,9 +1,18 @@
 #ifndef _NETBT_HCI_H_
 #define _NETBT_HCI_H_
 
-#include "CommonTypes.h"
 #pragma pack(push, 1)
 
+typedef u8 uint8_t;
+#ifdef _WIN32
+    typedef s8 int8_t;
+#endif
+typedef u16 uint16_t;
+typedef s16 int16_t;
+typedef u32 uint32_t;
+typedef s32 int32_t;
+
+
 #ifdef __cplusplus
 extern "C" {
 #endif