From d297d7c5f0396c90c0061f22274c97890bbe84e9 Mon Sep 17 00:00:00 2001
From: xiaoyu <xiaoyu@xiaoyu.com>
Date: Mon, 15 Apr 2024 10:36:35 +0800
Subject: [PATCH] 修复cocos编译错误

---
 ios/cocos2d/cocos/2d/CCFontAtlas.cpp       | 4 ++--
 ios/cocos2d/cocos/audio/apple/AudioCache.h | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ios/cocos2d/cocos/2d/CCFontAtlas.cpp b/ios/cocos2d/cocos/2d/CCFontAtlas.cpp
index 5818b2c..b7c7d0c 100644
--- a/ios/cocos2d/cocos/2d/CCFontAtlas.cpp
+++ b/ios/cocos2d/cocos/2d/CCFontAtlas.cpp
@@ -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& 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
     }
diff --git a/ios/cocos2d/cocos/audio/apple/AudioCache.h b/ios/cocos2d/cocos/audio/apple/AudioCache.h
index 3052e8b..93e1f3b 100644
--- a/ios/cocos2d/cocos/audio/apple/AudioCache.h
+++ b/ios/cocos2d/cocos/audio/apple/AudioCache.h
@@ -33,6 +33,7 @@
 
 #include "platform/CCPlatformMacros.h"
 #include "audio/apple/AudioMacros.h"
+#include <functional>
 
 NS_CC_BEGIN
 
--
libgit2 0.22.2