fix macro

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

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

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_

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"

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_

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"

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_