Solve compiling errors when some macros changed in ccConfig.h.
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop

Conflicts:
	cocos/2d/CCActionInterval.cpp
Merge pull request #6352 from natural-law/develop

Solve compiling errors when some macros changed in ccConfig.h.