issue #2771: move header definition to first line

cocos/physics/CCPhysicsBody.h

@@ -22,12 +22,12 @@
  THE SOFTWARE.
  ****************************************************************************/
 
-#include "CCPhysicsSetting.h"
-#ifdef CC_USE_PHYSICS
-
 #ifndef __CCPHYSICS_BODY_H__
 #define __CCPHYSICS_BODY_H__
 
+#include "CCPhysicsSetting.h"
+#ifdef CC_USE_PHYSICS
+
 #include "CCObject.h"
 #include "CCGeometry.h"
 #include "CCArray.h"
@@ -300,6 +300,5 @@ protected:
 
 NS_CC_END
 
-#endif // __CCPHYSICS_BODY_H__
-
 #endif // CC_USE_PHYSICS
+#endif // __CCPHYSICS_BODY_H__

cocos/physics/CCPhysicsContact.h

@@ -22,12 +22,12 @@
  THE SOFTWARE.
  ****************************************************************************/
 
-#include "CCPhysicsSetting.h"
-#ifdef CC_USE_PHYSICS
-
 #ifndef __CCPHYSICS_CONTACT_H__
 #define __CCPHYSICS_CONTACT_H__
 
+#include "CCPhysicsSetting.h"
+#ifdef CC_USE_PHYSICS
+
 #include "CCObject.h"
 #include "CCGeometry.h"
 #include "CCEventListenerCustom.h"
@@ -267,6 +267,6 @@ protected:
 };
 
 NS_CC_END
-#endif //__CCPHYSICS_CONTACT_H__
 
 #endif // CC_USE_PHYSICS
+#endif //__CCPHYSICS_CONTACT_H__

cocos/physics/CCPhysicsJoint.h

@@ -22,12 +22,12 @@
  THE SOFTWARE.
  ****************************************************************************/
 
-#include "CCPhysicsSetting.h"
-#ifdef CC_USE_PHYSICS
-
 #ifndef __CCPHYSICS_JOINT_H__
 #define __CCPHYSICS_JOINT_H__
 
+#include "CCPhysicsSetting.h"
+#ifdef CC_USE_PHYSICS
+
 #include "CCObject.h"
 #include "CCGeometry.h"
 
@@ -181,6 +181,5 @@ protected:
 
 NS_CC_END
 
-#endif // __CCPHYSICS_JOINT_H__
-
 #endif // CC_USE_PHYSICS
+#endif // __CCPHYSICS_JOINT_H__

cocos/physics/CCPhysicsShape.h

@@ -22,12 +22,12 @@
  THE SOFTWARE.
  ****************************************************************************/
 
-#include "CCPhysicsSetting.h"
-#ifdef CC_USE_PHYSICS
-
 #ifndef __CCPHYSICS_SHAPE_H__
 #define __CCPHYSICS_SHAPE_H__
 
+#include "CCPhysicsSetting.h"
+#ifdef CC_USE_PHYSICS
+
 #include "CCObject.h"
 #include "CCGeometry.h"
 
@@ -309,6 +309,6 @@ protected:
 };
 
 NS_CC_END
-#endif // __CCPHYSICS_FIXTURE_H__
 
 #endif // CC_USE_PHYSICS
+#endif // __CCPHYSICS_FIXTURE_H__

cocos/physics/CCPhysicsWorld.h

@@ -22,12 +22,12 @@
  THE SOFTWARE.
  ****************************************************************************/
 
-#include "CCPhysicsSetting.h"
-#ifdef CC_USE_PHYSICS
-
 #ifndef __CCPHYSICS_WORLD_H__
 #define __CCPHYSICS_WORLD_H__
 
+#include "CCPhysicsSetting.h"
+#ifdef CC_USE_PHYSICS
+
 #include <list>
 #include <vector>
 
@@ -192,6 +192,5 @@ protected:
 
 NS_CC_END
 
-#endif // __CCPHYSICS_WORLD_H__
-
 #endif // CC_USE_PHYSICS
+#endif // __CCPHYSICS_WORLD_H__

cocos/physics/box2d/CCPhysicsBodyInfo_box2d.h

@@ -22,12 +22,12 @@
  THE SOFTWARE.
  ****************************************************************************/
 
+#ifndef __CCPHYSICS_BODY_INFO_BOX2D_H__
+#define __CCPHYSICS_BODY_INFO_BOX2D_H__
+
 #include "../CCPhysicsSetting.h"
 #if (CC_PHYSICS_ENGINE == CC_PHYSICS_BOX2D)
 
-#ifndef __CCPHYSICS_BODY_INFO_H__
-#define __CCPHYSICS_BODY_INFO_H__
-
 #include "CCPlatformMacros.h"
 
 NS_CC_BEGIN
@@ -40,6 +40,6 @@ public:
 };
 
 NS_CC_END
-#endif // __CCPHYSICS_BODY_INFO_H__
 
 #endif // CC_PHYSICS_ENGINE == CC_PHYSICS_BOX2D
+#endif // __CCPHYSICS_BODY_INFO_BOX2D_H__

cocos/physics/box2d/CCPhysicsContactInfo_box2d.h

@@ -22,12 +22,12 @@
  THE SOFTWARE.
  ****************************************************************************/
 
+#ifndef __CCPHYSICS_CONTACT_INFO_BOX2D_H__
+#define __CCPHYSICS_CONTACT_INFO_BOX2D_H__
+
 #include "../CCPhysicsSetting.h"
 #if (CC_PHYSICS_ENGINE == CC_PHYSICS_BOX2D)
 
-#ifndef __CCPHYSICS_CONTACT_INFO_H__
-#define __CCPHYSICS_CONTACT_INFO_H__
-
 #include "CCPlatformMacros.h"
 NS_CC_BEGIN
 
@@ -39,6 +39,6 @@ public:
 };
 
 NS_CC_END
-#endif // __CCPHYSICS_CONTACT_INFO_H__
 
 #endif // CC_PHYSICS_ENGINE == CC_PHYSICS_BOX2D
+#endif // __CCPHYSICS_CONTACT_INFO_BOX2D_H__

cocos/physics/box2d/CCPhysicsHelper_box2d.h

@@ -22,11 +22,11 @@
  THE SOFTWARE.
  ****************************************************************************/
 
+#ifndef __CCPHYSICS_HELPER_BOX2D_H__
+#define __CCPHYSICS_HELPER_BOX2D_H__
+
 #include "../CCPhysicsSetting.h"
 #if (CC_PHYSICS_ENGINE == CC_PHYSICS_BOX2D)
-
-#ifndef __CCPHYSICS_HELPER_H__
-#define __CCPHYSICS_HELPER_H__
 #include "CCPlatformMacros.h"
 #include "CCGeometry.h"
 
@@ -37,6 +37,6 @@ class PhysicsHelper
 };
 
 NS_CC_END
-#endif // __CCPHYSICS_HELPER_H__
 
 #endif // CC_PHYSICS_ENGINE == CC_PHYSICS_BOX2D
+#endif // __CCPHYSICS_HELPER_BOX2D_H__

cocos/physics/box2d/CCPhysicsJointInfo_box2d.h

@@ -22,12 +22,12 @@
  THE SOFTWARE.
  ****************************************************************************/
 
+#ifndef __CCPHYSICS_JOINT_INFO_BOX2D_H__
+#define __CCPHYSICS_JOINT_INFO_BOX2D_H__
+
 #include "../CCPhysicsSetting.h"
 #if (CC_PHYSICS_ENGINE == CC_PHYSICS_BOX2D)
 
-#ifndef __CCPHYSICS_JOINT_INFO_H__
-#define __CCPHYSICS_JOINT_INFO_H__
-
 #include "CCPlatformMacros.h"
 NS_CC_BEGIN
 
@@ -39,6 +39,6 @@ public:
 };
 
 NS_CC_END
-#endif // __CCPHYSICS_JOINT_INFO_H__
 
 #endif // CC_PHYSICS_ENGINE == CC_PHYSICS_BOX2D
+#endif // __CCPHYSICS_JOINT_INFO_BOX2D_H__

cocos/physics/box2d/CCPhysicsShapeInfo_box2d.h

@@ -22,12 +22,12 @@
  THE SOFTWARE.
  ****************************************************************************/
 
+#ifndef __CCPHYSICS_SHAPE_INFO_BOX2D_H__
+#define __CCPHYSICS_SHAPE_INFO_BOX2D_H__
+
 #include "../CCPhysicsSetting.h"
 #if (CC_PHYSICS_ENGINE == CC_PHYSICS_BOX2D)
 
-#ifndef __CCPHYSICS_SHAPE_INFO_H__
-#define __CCPHYSICS_SHAPE_INFO_H__
-
 #include "CCPlatformMacros.h"
 NS_CC_BEGIN
 
@@ -39,6 +39,6 @@ public:
 };
 
 NS_CC_END
-#endif // __CCPHYSICS_SHAPE_INFO_H__
 
 #endif // CC_PHYSICS_ENGINE == CC_PHYSICS_BOX2D
+#endif // __CCPHYSICS_SHAPE_INFO_BOX2D_H__

cocos/physics/box2d/CCPhysicsWorldInfo_box2d.h

@@ -22,12 +22,12 @@
  THE SOFTWARE.
  ****************************************************************************/
 
+#ifndef __CCPHYSICS_WORLD_INFO_BOX2D_H__
+#define __CCPHYSICS_WORLD_INFO_BOX2D_H__
+
 #include "../CCPhysicsSetting.h"
 #if (CC_PHYSICS_ENGINE == CC_PHYSICS_BOX2D)
 
-#ifndef __CCPHYSICS_WORLD_INFO_H__
-#define __CCPHYSICS_WORLD_INFO_H__
-
 #include "CCPlatformMacros.h"
 NS_CC_BEGIN
 
@@ -39,6 +39,6 @@ public:
 };
 
 NS_CC_END
-#endif // __CCPHYSICS_WORLD_INFO_H__
 
 #endif // CC_PHYSICS_ENGINE == CC_PHYSICS_BOX2D
+#endif // __CCPHYSICS_WORLD_INFO_BOX2D_H__

cocos/physics/chipmunk/CCPhysicsBodyInfo_chipmunk.h

@@ -22,12 +22,12 @@
  THE SOFTWARE.
  ****************************************************************************/
 
+#ifndef __CCPHYSICS_BODY_INFO_CHIPMUNK_H__
+#define __CCPHYSICS_BODY_INFO_CHIPMUNK_H__
+
 #include "../CCPhysicsSetting.h"
 #if (CC_PHYSICS_ENGINE == CC_PHYSICS_CHIPMUNK)
 
-#ifndef __CCPHYSICS_BODY_INFO_H__
-#define __CCPHYSICS_BODY_INFO_H__
-
 #include "chipmunk.h"
 #include "CCPlatformMacros.h"
 #include "CCObject.h"
@@ -51,6 +51,6 @@ private:
 };
 
 NS_CC_END
-#endif // __CCPHYSICS_BODY_INFO_H__
 
 #endif // CC_PHYSICS_ENGINE == CC_PHYSICS_CHIPMUNK
+#endif // __CCPHYSICS_BODY_INFO_CHIPMUNK_H__

cocos/physics/chipmunk/CCPhysicsContactInfo_chipmunk.h

@@ -22,12 +22,12 @@
  THE SOFTWARE.
  ****************************************************************************/
 
+#ifndef __CCPHYSICS_CONTACT_INFO_CHIPMUNK_H__
+#define __CCPHYSICS_CONTACT_INFO_CHIPMUNK_H__
+
 #include "../CCPhysicsSetting.h"
 #if (CC_PHYSICS_ENGINE == CC_PHYSICS_CHIPMUNK)
 
-#ifndef __CCPHYSICS_CONTACT_INFO_H__
-#define __CCPHYSICS_CONTACT_INFO_H__
-
 #include "chipmunk.h"
 #include "CCPlatformMacros.h"
 NS_CC_BEGIN
@@ -49,6 +49,6 @@ private:
 };
 
 NS_CC_END
-#endif // __CCPHYSICS_WORLD_INFO_H__
 
 #endif // CC_PHYSICS_ENGINE == CC_PHYSICS_CHIPMUNK
+#endif // __CCPHYSICS_CONTACT_INFO_CHIPMUNK_H__

cocos/physics/chipmunk/CCPhysicsHelper_chipmunk.h

@@ -22,12 +22,12 @@
  THE SOFTWARE.
  ****************************************************************************/
 
+#ifndef __CCPHYSICS_HELPER_CHIPMUNK_H__
+#define __CCPHYSICS_HELPER_CHIPMUNK_H__
+
 #include "../CCPhysicsSetting.h"
 #if (CC_PHYSICS_ENGINE == CC_PHYSICS_CHIPMUNK)
 
-#ifndef __CCPHYSICS_HELPER_H__
-#define __CCPHYSICS_HELPER_H__
-
 #include "chipmunk.h"
 #include "CCPlatformMacros.h"
 #include "CCGeometry.h"
@@ -68,6 +68,6 @@ public:
 };
 
 NS_CC_END
-#endif // __CCPHYSICS_HELPER_H__
 
 #endif // CC_PHYSICS_ENGINE == CC_PHYSICS_CHIPMUNK
+#endif // __CCPHYSICS_HELPER_CHIPMUNK_H__

cocos/physics/chipmunk/CCPhysicsJointInfo_chipmunk.h

@@ -22,12 +22,12 @@
  THE SOFTWARE.
  ****************************************************************************/
 
+#ifndef __CCPHYSICS_JOINT_INFO_CHIPMUNK_H__
+#define __CCPHYSICS_JOINT_INFO_CHIPMUNK_H__
+
 #include "../CCPhysicsSetting.h"
 #if (CC_PHYSICS_ENGINE == CC_PHYSICS_CHIPMUNK)
 
-#ifndef __CCPHYSICS_JOINT_INFO_H__
-#define __CCPHYSICS_JOINT_INFO_H__
-
 #include "chipmunk.h"
 #include "CCPlatformMacros.h"
 #include <vector>
@@ -60,6 +60,6 @@ private:
 };
 
 NS_CC_END
-#endif // __CCPHYSICS_SHAPE_INFO_H__
 
 #endif // CC_PHYSICS_ENGINE == CC_PHYSICS_CHIPMUNK
+#endif // __CCPHYSICS_JOINT_INFO_CHIPMUNK_H__

cocos/physics/chipmunk/CCPhysicsShapeInfo_chipmunk.h

@@ -22,12 +22,12 @@
  THE SOFTWARE.
  ****************************************************************************/
 
+#ifndef __CCPHYSICS_SHAPE_INFO_CHIPMUNK_H__
+#define __CCPHYSICS_SHAPE_INFO_CHIPMUNK_H__
+
 #include "../CCPhysicsSetting.h"
 #if (CC_PHYSICS_ENGINE == CC_PHYSICS_CHIPMUNK)
 
-#ifndef __CCPHYSICS_SHAPE_INFO_H__
-#define __CCPHYSICS_SHAPE_INFO_H__
-
 #include <vector>
 #include <map>
 #include "chipmunk.h"
@@ -70,6 +70,6 @@ private:
 };
 
 NS_CC_END
-#endif // __CCPHYSICS_SHAPE_INFO_H__
 
 #endif // CC_PHYSICS_ENGINE == CC_PHYSICS_CHIPMUNK
+#endif // __CCPHYSICS_SHAPE_INFO_CHIPMUNK_H__

cocos/physics/chipmunk/CCPhysicsWorldInfo_chipmunk.h

@@ -22,12 +22,12 @@
  THE SOFTWARE.
  ****************************************************************************/
 
+#ifndef __CCPHYSICS_WORLD_INFO_CHIPMUNK_H__
+#define __CCPHYSICS_WORLD_INFO_CHIPMUNK_H__
+
 #include "../CCPhysicsSetting.h"
 #if (CC_PHYSICS_ENGINE == CC_PHYSICS_CHIPMUNK)
 
-#ifndef __CCPHYSICS_WORLD_INFO_H__
-#define __CCPHYSICS_WORLD_INFO_H__
-
 #include "chipmunk.h"
 #include "CCPlatformMacros.h"
 #include <vector>
@@ -55,6 +55,6 @@ private:
 };
 
 NS_CC_END
-#endif // __CCPHYSICS_WORLD_INFO_H__
 
 #endif // CC_PHYSICS_ENGINE == CC_PHYSICS_CHIPMUNK
+#endif // __CCPHYSICS_WORLD_INFO_CHIPMUNK_H__