use __ prefix on header guards to avoid mixing up defines with api functions / classes.

8 files changed, 24 insertions, 24 deletions

diff --git a/source/gameengine/Physics/common/PHY_DynamicTypes.h b/source/gameengine/Physics/common/PHY_DynamicTypes.h
index a1761131a8e..a72929d25c5 100644
--- a/source/gameengine/Physics/common/PHY_DynamicTypes.h
+++ b/source/gameengine/Physics/common/PHY_DynamicTypes.h
@@ -17,8 +17,8 @@ subject to the following restrictions:
  *  \ingroup phys
  */
 
-#ifndef __PHY_DYNAMIC_TYPES
-#define __PHY_DYNAMIC_TYPES
+#ifndef __PHY_DYNAMICTYPES_H__
+#define __PHY_DYNAMICTYPES_H__
 
 
 
@@ -151,4 +151,4 @@ typedef enum PHY_ShapeType {
 
 typedef float	PHY_Vector3[3];
 
-#endif //__PHY_DYNAMIC_TYPES
+#endif //__PHY_DYNAMICTYPES_H__
diff --git a/source/gameengine/Physics/common/PHY_IController.h b/source/gameengine/Physics/common/PHY_IController.h
index 672f2e5a655..d25af9f898c 100644
--- a/source/gameengine/Physics/common/PHY_IController.h
+++ b/source/gameengine/Physics/common/PHY_IController.h
@@ -29,8 +29,8 @@
  *  \ingroup phys
  */
 
-#ifndef PHY_ICONTROLLER_H
-#define PHY_ICONTROLLER_H
+#ifndef __PHY_ICONTROLLER_H__
+#define __PHY_ICONTROLLER_H__
 
 #include "PHY_DynamicTypes.h"
 
@@ -62,5 +62,5 @@ public:
 #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 46f17014090..6a94b3d6ea9 100644
--- a/source/gameengine/Physics/common/PHY_IGraphicController.h
+++ b/source/gameengine/Physics/common/PHY_IGraphicController.h
@@ -29,8 +29,8 @@
  *  \ingroup phys
  */
 
-#ifndef PHY_IGRAPHICCONTROLLER_H
-#define PHY_IGRAPHICCONTROLLER_H
+#ifndef __PHY_IGRAPHICCONTROLLER_H__
+#define __PHY_IGRAPHICCONTROLLER_H__
 
 #include "PHY_IController.h"
 
@@ -59,5 +59,5 @@ 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 1ffd3adac9a..77c51ebdb79 100644
--- a/source/gameengine/Physics/common/PHY_IMotionState.h
+++ b/source/gameengine/Physics/common/PHY_IMotionState.h
@@ -29,8 +29,8 @@
  *  \ingroup phys
  */
 
-#ifndef PHY__MOTIONSTATE_H
-#define PHY__MOTIONSTATE_H
+#ifndef __PHY_IMOTIONSTATE_H__
+#define __PHY_IMOTIONSTATE_H__
 
 #ifdef WITH_CXX_GUARDEDALLOC
 #include "MEM_guardedalloc.h"
@@ -67,5 +67,5 @@ public:
 #endif
 };
 
-#endif //PHY__MOTIONSTATE_H
+#endif //__PHY_IMOTIONSTATE_H__
 
diff --git a/source/gameengine/Physics/common/PHY_IPhysicsController.h b/source/gameengine/Physics/common/PHY_IPhysicsController.h
index 31a7d71745e..727cbda931d 100644
--- a/source/gameengine/Physics/common/PHY_IPhysicsController.h
+++ b/source/gameengine/Physics/common/PHY_IPhysicsController.h
@@ -29,8 +29,8 @@
  *  \ingroup phys
  */
 
-#ifndef PHY_IPHYSICSCONTROLLER_H
-#define PHY_IPHYSICSCONTROLLER_H
+#ifndef __PHY_IPHYSICSCONTROLLER_H__
+#define __PHY_IPHYSICSCONTROLLER_H__
 
 #include "PHY_IController.h"
 
@@ -109,5 +109,5 @@ public:
 #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 adf6fb03bc1..f64f55b6592 100644
--- a/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h
+++ b/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h
@@ -29,8 +29,8 @@
  *  \ingroup phys
  */
 
-#ifndef _IPHYSICSENVIRONMENT
-#define _IPHYSICSENVIRONMENT
+#ifndef __PHY_IPHYSICSENVIRONMENT_H__
+#define __PHY_IPHYSICSENVIRONMENT_H__
 
 #include <vector>
 #include "PHY_DynamicTypes.h"
@@ -187,5 +187,5 @@ public:
 #endif
 };
 
-#endif //_IPHYSICSENVIRONMENT
+#endif //__PHY_IPHYSICSENVIRONMENT_H__
 
diff --git a/source/gameengine/Physics/common/PHY_IVehicle.h b/source/gameengine/Physics/common/PHY_IVehicle.h
index da9daa29977..735ce5a8791 100644
--- a/source/gameengine/Physics/common/PHY_IVehicle.h
+++ b/source/gameengine/Physics/common/PHY_IVehicle.h
@@ -3,8 +3,8 @@
  *  \ingroup phys
  */
 
-#ifndef PHY_IVEHICLE_H
-#define PHY_IVEHICLE_H
+#ifndef __PHY_IVEHICLE_H__
+#define __PHY_IVEHICLE_H__
 
 //PHY_IVehicle provides a generic interface for (raycast based) vehicles. Mostly targetting 4 wheel cars and 2 wheel motorbikes.
 
@@ -68,4 +68,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 4189db27c17..110d4731cdc 100644
--- a/source/gameengine/Physics/common/PHY_Pro.h
+++ b/source/gameengine/Physics/common/PHY_Pro.h
@@ -29,8 +29,8 @@
  *  \ingroup phys
  */
 
-#ifndef PHY_PROPSH
-#define PHY_PROPSH
+#ifndef __PHY_PRO_H__
+#define __PHY_PRO_H__
 
 #include <MT_Scalar.h>
 
@@ -59,5 +59,5 @@ struct PHY_MaterialProps {
 	bool      m_fh_normal;             // Should the object slide off slopes?
 };
 
-#endif //PHY_PROPSH
+#endif //__PHY_PRO_H__