Skip to content

avoid symbol conflict with other libraries of base64 functions #20276

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 31, 2019
Merged

avoid symbol conflict with other libraries of base64 functions #20276

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions cocos/base/base64.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,6 @@ THE SOFTWARE.
/// @cond DO_NOT_SHOW

#include "platform/CCPlatformMacros.h"

#ifdef __cplusplus
extern "C" {
#endif

namespace cocos2d {

Expand Down Expand Up @@ -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__