From 95ccd7fe70f4e292ff3002a6983b2619092c4181 Mon Sep 17 00:00:00 2001 From: Naruto TAKAHASHI Date: Thu, 31 Oct 2019 18:25:46 +0900 Subject: [PATCH] remove extern "C" from base/base64.h for avoiding base64 function symbols conflict at linking libraries. (#20276) --- cocos/base/base64.h | 7 ------- 1 file changed, 7 deletions(-) diff --git a/cocos/base/base64.h b/cocos/base/base64.h index 419b6d47b037..abd3369138ea 100644 --- a/cocos/base/base64.h +++ b/cocos/base/base64.h @@ -29,10 +29,6 @@ THE SOFTWARE. /// @cond DO_NOT_SHOW #include "platform/CCPlatformMacros.h" - -#ifdef __cplusplus -extern "C" { -#endif namespace cocos2d { @@ -62,9 +58,6 @@ int CC_DLL base64Encode(const unsigned char *in, unsigned int inLength, char **o }//namespace cocos2d -#ifdef __cplusplus -} -#endif /// @endcond #endif // __SUPPORT_BASE64_H__