From 92d345156b093a12f5f8812ec6e215ee3f2fdc69 Mon Sep 17 00:00:00 2001
From: Dhilan007 <wenhai.lin@chukong-inc.com>
Date: Tue, 14 Jan 2014 14:20:22 +0800
Subject: [PATCH] un-define clash with the existing macro definition in
 platform/win32/CCStdC.h

---
 cocos/2d/CCTMXTiledMap.cpp                                     | 2 --
 cocos/2d/platform/win32/CCStdC.h                               | 3 +++
 cocos/base/CCConsole.cpp                                       | 3 ---
 cocos/base/CCGeometry.cpp                                      | 2 --
 cocos/network/WebSocket.cpp                                    | 2 --
 .../TestCpp/Classes/PerformanceTest/PerformanceLabelTest.cpp   | 3 ---
 .../TestCpp/Classes/PerformanceTest/PerformanceSpriteTest.cpp  | 3 ---
 samples/Cpp/TestCpp/Classes/TileMapTest/TileMapTest.cpp        | 3 ---
 8 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/cocos/2d/CCTMXTiledMap.cpp b/cocos/2d/CCTMXTiledMap.cpp
index 2a85788b53..33a4b77519 100644
--- a/cocos/2d/CCTMXTiledMap.cpp
+++ b/cocos/2d/CCTMXTiledMap.cpp
@@ -30,8 +30,6 @@ THE SOFTWARE.
 #include "CCSprite.h"
 #include <algorithm>
 
-#undef min
-#undef max
 NS_CC_BEGIN
 
 // implementation TMXTiledMap
diff --git a/cocos/2d/platform/win32/CCStdC.h b/cocos/2d/platform/win32/CCStdC.h
index 19ea8fda7d..47677d29c9 100644
--- a/cocos/2d/platform/win32/CCStdC.h
+++ b/cocos/2d/platform/win32/CCStdC.h
@@ -148,5 +148,8 @@ inline errno_t strcpy_s(char *strDestination, size_t numberOfElements,
 #undef DELETE
 #endif
 
+#undef min
+#undef max
+
 #endif  // __CC_STD_C_H__
 
diff --git a/cocos/base/CCConsole.cpp b/cocos/base/CCConsole.cpp
index 7505ab585e..69c44c4494 100644
--- a/cocos/base/CCConsole.cpp
+++ b/cocos/base/CCConsole.cpp
@@ -51,9 +51,6 @@
 #include "CCScene.h"
 #include "CCPlatformConfig.h"
 
-#undef min
-#undef max
-
 NS_CC_BEGIN
 
 
diff --git a/cocos/base/CCGeometry.cpp b/cocos/base/CCGeometry.cpp
index 968ff8e0ba..4be119ff6b 100644
--- a/cocos/base/CCGeometry.cpp
+++ b/cocos/base/CCGeometry.cpp
@@ -27,8 +27,6 @@ THE SOFTWARE.
 #include "ccMacros.h"
 #include <algorithm>
 
-#undef min
-#undef max
 // implementation of Point
 NS_CC_BEGIN
 
diff --git a/cocos/network/WebSocket.cpp b/cocos/network/WebSocket.cpp
index 01432c033e..5e17487567 100644
--- a/cocos/network/WebSocket.cpp
+++ b/cocos/network/WebSocket.cpp
@@ -39,8 +39,6 @@
 
 #define WS_WRITE_BUFFER_SIZE 2048
 
-#undef min
-#undef max
 NS_CC_BEGIN
 
 namespace network {
diff --git a/samples/Cpp/TestCpp/Classes/PerformanceTest/PerformanceLabelTest.cpp b/samples/Cpp/TestCpp/Classes/PerformanceTest/PerformanceLabelTest.cpp
index 3efe4d3993..317bbb8a60 100644
--- a/samples/Cpp/TestCpp/Classes/PerformanceTest/PerformanceLabelTest.cpp
+++ b/samples/Cpp/TestCpp/Classes/PerformanceTest/PerformanceLabelTest.cpp
@@ -1,8 +1,5 @@
 #include "PerformanceLabelTest.h"
 
-#undef min
-#undef max
-
 enum {
     kMaxNodes = 200,
     kNodesIncrease = 10,
diff --git a/samples/Cpp/TestCpp/Classes/PerformanceTest/PerformanceSpriteTest.cpp b/samples/Cpp/TestCpp/Classes/PerformanceTest/PerformanceSpriteTest.cpp
index e1b150278f..a9e6f78c94 100644
--- a/samples/Cpp/TestCpp/Classes/PerformanceTest/PerformanceSpriteTest.cpp
+++ b/samples/Cpp/TestCpp/Classes/PerformanceTest/PerformanceSpriteTest.cpp
@@ -1,8 +1,5 @@
 #include "PerformanceSpriteTest.h"
 
-#undef min
-#undef max
-
 enum {
     kMaxNodes = 50000,
     kNodesIncrease = 250,
diff --git a/samples/Cpp/TestCpp/Classes/TileMapTest/TileMapTest.cpp b/samples/Cpp/TestCpp/Classes/TileMapTest/TileMapTest.cpp
index fcde928c1e..75f0fd6eee 100644
--- a/samples/Cpp/TestCpp/Classes/TileMapTest/TileMapTest.cpp
+++ b/samples/Cpp/TestCpp/Classes/TileMapTest/TileMapTest.cpp
@@ -3,9 +3,6 @@
 #include "renderer/CCRenderer.h"
 #include "renderer/CCCustomCommand.h"
 
-#undef min
-#undef max
-
 enum 
 {
     kTagTileMap = 1,