修复cocos编译错误

xiaoyu
1 parent d9b91e0c
Showing 2 changed files with 3 additions and 2 deletions
ios/cocos2d/cocos/2d/CCFontAtlas.cpp
ios/cocos2d/cocos/audio/apple/AudioCache.h
@@ -129,7 +129,7 @@ FontAtlas::~FontAtlas()
 #if CC_TARGET_PLATFORM != CC_PLATFORM_WIN32 && CC_TARGET_PLATFORM != CC_PLATFORM_ANDROID
     if (_iconv)
     {
-        iconv_close(_iconv);
+        iconv_close((iconv_t)_iconv);
         _iconv = nullptr;
     }
 #endif
@@ -262,7 +262,7 @@ void FontAtlas::conversionU32TOGB2312(const std::u32string&amp; u32Text, std::unorde
             size_t inLen = strLen * 2;
             size_t outLen = gb2312StrSize;
  
-            iconv(_iconv, (char**)&pin, &inLen, &pout, &outLen);
+            iconv((iconv_t)_iconv, (char**)&pin, &inLen, &pout, &outLen);
         }
 #endif
     }
@@ -33,6 +33,7 @@
  
 #include "platform/CCPlatformMacros.h"
 #include "audio/apple/AudioMacros.h"
+#include <functional>
  
 NS_CC_BEGIN