From db45794625a8f70c03e7e40f522c313df90a31fb Mon Sep 17 00:00:00 2001
From: Dhilan007 <wenhai.lin@chukong-inc.com>
Date: Tue, 30 Sep 2014 09:57:28 +0800
Subject: [PATCH] fix macro

---
 cocos/audio/apple/AudioPlayer.h         | 5 +----
 cocos/audio/win32/AudioCache.cpp        | 4 +++-
 cocos/audio/win32/AudioCache.h          | 2 ++
 cocos/audio/win32/AudioEngine-win32.cpp | 3 +++
 cocos/audio/win32/AudioEngine-win32.h   | 2 ++
 cocos/audio/win32/AudioPlayer.cpp       | 2 ++
 cocos/audio/win32/AudioPlayer.h         | 2 ++
 7 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/cocos/audio/apple/AudioPlayer.h b/cocos/audio/apple/AudioPlayer.h
index 20f4efdb9e..3b5a125784 100644
--- a/cocos/audio/apple/AudioPlayer.h
+++ b/cocos/audio/apple/AudioPlayer.h
@@ -30,12 +30,9 @@
 
 #include <condition_variable>
 #include <mutex>
-<<<<<<< HEAD:cocos/audio/ios/AudioPlayer.h
 #include <string>
-#import <OpenAL/al.h>
-=======
 #include <thread>
->>>>>>> f1a01c54627e01cfeaa54332967695c8d33e3a00:cocos/audio/apple/AudioPlayer.h
+#import <OpenAL/al.h>
 #include "CCPlatformMacros.h"
 
 NS_CC_BEGIN
diff --git a/cocos/audio/win32/AudioCache.cpp b/cocos/audio/win32/AudioCache.cpp
index 443c0e082b..542d9ee074 100644
--- a/cocos/audio/win32/AudioCache.cpp
+++ b/cocos/audio/win32/AudioCache.cpp
@@ -21,7 +21,10 @@
  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  THE SOFTWARE.
  ****************************************************************************/
+#include "platform/CCPlatformConfig.h"
+
 #if CC_TARGET_PLATFORM == CC_PLATFORM_WIN32
+
 #include "AudioCache.h"
 #include <thread>
 #include <algorithm>
@@ -29,7 +32,6 @@
 #include "mpg123.h"
 #include "vorbis/codec.h"
 #include "vorbis/vorbisfile.h"
-
 #include "base/ccUtils.h"
 
 #define PCMDATA_CACHEMAXSIZE 2621440
diff --git a/cocos/audio/win32/AudioCache.h b/cocos/audio/win32/AudioCache.h
index f93ea2a27f..213de2c36f 100644
--- a/cocos/audio/win32/AudioCache.h
+++ b/cocos/audio/win32/AudioCache.h
@@ -21,6 +21,8 @@
  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  THE SOFTWARE.
  ****************************************************************************/
+#include "platform/CCPlatformConfig.h"
+
 #if CC_TARGET_PLATFORM == CC_PLATFORM_WIN32
 
 #ifndef __AUDIO_CACHE_H_
diff --git a/cocos/audio/win32/AudioEngine-win32.cpp b/cocos/audio/win32/AudioEngine-win32.cpp
index 481cc4b9eb..c0592f965c 100644
--- a/cocos/audio/win32/AudioEngine-win32.cpp
+++ b/cocos/audio/win32/AudioEngine-win32.cpp
@@ -21,7 +21,10 @@
  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  THE SOFTWARE.
  ****************************************************************************/
+#include "platform/CCPlatformConfig.h"
+
 #if CC_TARGET_PLATFORM == CC_PLATFORM_WIN32
+
 #include "AudioEngine-win32.h"
 #include <condition_variable>
 #include "AL/alc.h"
diff --git a/cocos/audio/win32/AudioEngine-win32.h b/cocos/audio/win32/AudioEngine-win32.h
index 1411a6277a..8103f3d027 100644
--- a/cocos/audio/win32/AudioEngine-win32.h
+++ b/cocos/audio/win32/AudioEngine-win32.h
@@ -21,6 +21,8 @@
  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  THE SOFTWARE.
  ****************************************************************************/
+#include "platform/CCPlatformConfig.h"
+
 #if CC_TARGET_PLATFORM == CC_PLATFORM_WIN32
 
 #ifndef __AUDIO_ENGINE_INL_H_
diff --git a/cocos/audio/win32/AudioPlayer.cpp b/cocos/audio/win32/AudioPlayer.cpp
index 9e0d8373f8..e72a44e5d9 100644
--- a/cocos/audio/win32/AudioPlayer.cpp
+++ b/cocos/audio/win32/AudioPlayer.cpp
@@ -21,6 +21,8 @@
  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  THE SOFTWARE.
  ****************************************************************************/
+#include "platform/CCPlatformConfig.h"
+
 #if CC_TARGET_PLATFORM == CC_PLATFORM_WIN32
 #include "AudioPlayer.h"
 #include "AudioCache.h"
diff --git a/cocos/audio/win32/AudioPlayer.h b/cocos/audio/win32/AudioPlayer.h
index c062dc8c60..f72dc90341 100644
--- a/cocos/audio/win32/AudioPlayer.h
+++ b/cocos/audio/win32/AudioPlayer.h
@@ -21,6 +21,8 @@
  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  THE SOFTWARE.
  ****************************************************************************/
+#include "platform/CCPlatformConfig.h"
+
 #if CC_TARGET_PLATFORM == CC_PLATFORM_WIN32
 
 #ifndef __AUDIO_PLAYER_H_