Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

un-define clash with the existing macro definition in platform/win32/CCStdC.h

This commit is contained in:
Dhilan007 2014-01-14 14:20:22 +08:00
parent a1d8e8bdb1
commit 92d345156b
8 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cocos/2d/CCTMXTiledMap.cpp
View File

@ -30,8 +30,6 @@ THE SOFTWARE.
#include "CCSprite.h" #include "CCSprite.h"
#include <algorithm> #include <algorithm>
#undef min
#undef max
NS_CC_BEGIN NS_CC_BEGIN
// implementation TMXTiledMap // implementation TMXTiledMap

3
cocos/2d/platform/win32/CCStdC.h
View File

@ -148,5 +148,8 @@ inline errno_t strcpy_s(char *strDestination, size_t numberOfElements,
#undef DELETE #undef DELETE
#endif #endif
#undef min
#undef max
#endif // __CC_STD_C_H__ #endif // __CC_STD_C_H__

3
cocos/base/CCConsole.cpp
View File

@ -51,9 +51,6 @@
#include "CCScene.h" #include "CCScene.h"
#include "CCPlatformConfig.h" #include "CCPlatformConfig.h"
#undef min
#undef max
NS_CC_BEGIN NS_CC_BEGIN

2
cocos/base/CCGeometry.cpp
View File

@ -27,8 +27,6 @@ THE SOFTWARE.
#include "ccMacros.h" #include "ccMacros.h"
#include <algorithm> #include <algorithm>
#undef min
#undef max
// implementation of Point // implementation of Point
NS_CC_BEGIN NS_CC_BEGIN

2
cocos/network/WebSocket.cpp
View File

@ -39,8 +39,6 @@
#define WS_WRITE_BUFFER_SIZE 2048 #define WS_WRITE_BUFFER_SIZE 2048
#undef min
#undef max
NS_CC_BEGIN NS_CC_BEGIN
namespace network { namespace network {

3
samples/Cpp/TestCpp/Classes/PerformanceTest/PerformanceLabelTest.cpp
View File

@ -1,8 +1,5 @@
#include "PerformanceLabelTest.h" #include "PerformanceLabelTest.h"
#undef min
#undef max
enum { enum {
kMaxNodes = 200, kMaxNodes = 200,
kNodesIncrease = 10, kNodesIncrease = 10,

3
samples/Cpp/TestCpp/Classes/PerformanceTest/PerformanceSpriteTest.cpp
View File

@ -1,8 +1,5 @@
#include "PerformanceSpriteTest.h" #include "PerformanceSpriteTest.h"
#undef min
#undef max
enum { enum {
kMaxNodes = 50000, kMaxNodes = 50000,
kNodesIncrease = 250, kNodesIncrease = 250,

3
samples/Cpp/TestCpp/Classes/TileMapTest/TileMapTest.cpp
View File

@ -3,9 +3,6 @@
#include "renderer/CCRenderer.h" #include "renderer/CCRenderer.h"
#include "renderer/CCCustomCommand.h" #include "renderer/CCCustomCommand.h"
#undef min
#undef max
enum enum
{ {
kTagTileMap = 1, kTagTileMap = 1,