code cleanup: make header defines more consistent, JOYSENSOR header guard had a typo too.

12 files changed, 13 insertions, 20 deletions

diff --git a/source/gameengine/Physics/Bullet/CcdGraphicController.h b/source/gameengine/Physics/Bullet/CcdGraphicController.h
index 15edfeb5759..72eb699ce5b 100644
--- a/source/gameengine/Physics/Bullet/CcdGraphicController.h
+++ b/source/gameengine/Physics/Bullet/CcdGraphicController.h
@@ -87,4 +87,4 @@ private:
 #endif
 };
 
-#endif //BULLET2_PHYSICSCONTROLLER_H
+#endif  /* BULLET2_PHYSICSCONTROLLER_H */
diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsController.h b/source/gameengine/Physics/Bullet/CcdPhysicsController.h
index 2204f224e7d..6df5c85f5c0 100644
--- a/source/gameengine/Physics/Bullet/CcdPhysicsController.h
+++ b/source/gameengine/Physics/Bullet/CcdPhysicsController.h
@@ -665,4 +665,4 @@ class	DefaultMotionState : public PHY_IMotionState
 };
 
 
-#endif //__CCDPHYSICSCONTROLLER_H__
+#endif  /* __CCDPHYSICSCONTROLLER_H__ */
diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
index 453380b69ca..350ecd2588a 100644
--- a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
+++ b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
@@ -183,7 +183,7 @@ protected:
 		{
 			return 0;
 		}
-#endif //NEW_BULLET_VEHICLE_SUPPORT
+#endif  /* NEW_BULLET_VEHICLE_SUPPORT */
 
 		btTypedConstraint*	getConstraintById(int constraintId);
 
@@ -297,4 +297,4 @@ protected:
 #endif
 };
 
-#endif //__CCDPHYSICSENVIRONMENT_H__
+#endif  /* __CCDPHYSICSENVIRONMENT_H__ */
diff --git a/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h b/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h
index 4ddfe4d69e0..70de9c25553 100644
--- a/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h
+++ b/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h
@@ -102,5 +102,4 @@ public:
 #endif
 };
 
-#endif //__DUMMYPHYSICSENVIRONMENT_H__
-
+#endif  /* __DUMMYPHYSICSENVIRONMENT_H__ */
diff --git a/source/gameengine/Physics/common/PHY_DynamicTypes.h b/source/gameengine/Physics/common/PHY_DynamicTypes.h
index 6994706ce2d..0fe2533cf93 100644
--- a/source/gameengine/Physics/common/PHY_DynamicTypes.h
+++ b/source/gameengine/Physics/common/PHY_DynamicTypes.h
@@ -151,4 +151,4 @@ typedef enum PHY_ShapeType {
 
 typedef float	PHY_Vector3[3];
 
-#endif //__PHY_DYNAMICTYPES_H__
+#endif  /* __PHY_DYNAMICTYPES_H__ */
diff --git a/source/gameengine/Physics/common/PHY_IController.h b/source/gameengine/Physics/common/PHY_IController.h
index 729abd8ec04..003c4edf598 100644
--- a/source/gameengine/Physics/common/PHY_IController.h
+++ b/source/gameengine/Physics/common/PHY_IController.h
@@ -60,5 +60,4 @@ class PHY_IController
 #endif
 };
 
-#endif //__PHY_ICONTROLLER_H__
-
+#endif  /* __PHY_ICONTROLLER_H__ */
diff --git a/source/gameengine/Physics/common/PHY_IGraphicController.h b/source/gameengine/Physics/common/PHY_IGraphicController.h
index af337188818..cb13eda4f18 100644
--- a/source/gameengine/Physics/common/PHY_IGraphicController.h
+++ b/source/gameengine/Physics/common/PHY_IGraphicController.h
@@ -58,5 +58,4 @@ class PHY_IGraphicController : public PHY_IController
 #endif
 };
 
-#endif //__PHY_IGRAPHICCONTROLLER_H__
-
+#endif  /* __PHY_IGRAPHICCONTROLLER_H__ */
diff --git a/source/gameengine/Physics/common/PHY_IMotionState.h b/source/gameengine/Physics/common/PHY_IMotionState.h
index 72ff37468ee..ccf7cf74724 100644
--- a/source/gameengine/Physics/common/PHY_IMotionState.h
+++ b/source/gameengine/Physics/common/PHY_IMotionState.h
@@ -65,5 +65,4 @@ class	PHY_IMotionState
 #endif
 };
 
-#endif //__PHY_IMOTIONSTATE_H__
-
+#endif  /* __PHY_IMOTIONSTATE_H__ */
diff --git a/source/gameengine/Physics/common/PHY_IPhysicsController.h b/source/gameengine/Physics/common/PHY_IPhysicsController.h
index 7eea2a183a1..bc7671abe80 100644
--- a/source/gameengine/Physics/common/PHY_IPhysicsController.h
+++ b/source/gameengine/Physics/common/PHY_IPhysicsController.h
@@ -108,5 +108,4 @@ class PHY_IPhysicsController : public PHY_IController
 #endif
 };
 
-#endif //__PHY_IPHYSICSCONTROLLER_H__
-
+#endif  /* __PHY_IPHYSICSCONTROLLER_H__ */
diff --git a/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h b/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h
index 77016859c3f..66ca037aa47 100644
--- a/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h
+++ b/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h
@@ -185,5 +185,4 @@ class PHY_IPhysicsEnvironment
 #endif
 };
 
-#endif //__PHY_IPHYSICSENVIRONMENT_H__
-
+#endif  /* __PHY_IPHYSICSENVIRONMENT_H__ */
diff --git a/source/gameengine/Physics/common/PHY_IVehicle.h b/source/gameengine/Physics/common/PHY_IVehicle.h
index 731e22d9f0f..ecf7a87c40f 100644
--- a/source/gameengine/Physics/common/PHY_IVehicle.h
+++ b/source/gameengine/Physics/common/PHY_IVehicle.h
@@ -66,4 +66,4 @@ public:
 #endif
 };
 
-#endif //__PHY_IVEHICLE_H__
+#endif  /* __PHY_IVEHICLE_H__ */
diff --git a/source/gameengine/Physics/common/PHY_Pro.h b/source/gameengine/Physics/common/PHY_Pro.h
index b930177d3a8..7c5d9c9638e 100644
--- a/source/gameengine/Physics/common/PHY_Pro.h
+++ b/source/gameengine/Physics/common/PHY_Pro.h
@@ -62,5 +62,4 @@ struct PHY_MaterialProps {
 	bool      m_fh_normal;             // Should the object slide off slopes?
 };
 
-#endif //__PHY_PRO_H__
-
+#endif  /* __PHY_PRO_H__ */