use __ prefix on header guards to avoid mixing up defines with api functions / classes.
authorCampbell Barton <ideasman42@gmail.com>
Thu, 23 Feb 2012 10:41:31 +0000 (10:41 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 23 Feb 2012 10:41:31 +0000 (10:41 +0000)
212 files changed:
source/gameengine/BlenderRoutines/BL_System.h
source/gameengine/BlenderRoutines/KX_BlenderCanvas.h
source/gameengine/BlenderRoutines/KX_BlenderGL.h
source/gameengine/BlenderRoutines/KX_BlenderInputDevice.h
source/gameengine/BlenderRoutines/KX_BlenderKeyboardDevice.h
source/gameengine/BlenderRoutines/KX_BlenderMouseDevice.h
source/gameengine/BlenderRoutines/KX_BlenderRenderTools.h
source/gameengine/BlenderRoutines/KX_BlenderSystem.h
source/gameengine/Converter/BL_ActionActuator.h
source/gameengine/Converter/BL_ArmatureActuator.h
source/gameengine/Converter/BL_ArmatureChannel.h
source/gameengine/Converter/BL_ArmatureConstraint.h
source/gameengine/Converter/BL_ArmatureObject.h
source/gameengine/Converter/BL_BlenderDataConversion.h
source/gameengine/Converter/BL_DeformableGameObject.h
source/gameengine/Converter/BL_MeshDeformer.h
source/gameengine/Converter/BL_ModifierDeformer.h
source/gameengine/Converter/BL_ShapeActionActuator.h
source/gameengine/Converter/BL_ShapeDeformer.h
source/gameengine/Converter/BL_SkinDeformer.h
source/gameengine/Converter/BlenderWorldInfo.h
source/gameengine/Converter/KX_BlenderScalarInterpolator.h
source/gameengine/Converter/KX_BlenderSceneConverter.h
source/gameengine/Converter/KX_ConvertActuators.h
source/gameengine/Converter/KX_ConvertControllers.h
source/gameengine/Converter/KX_ConvertProperties.h
source/gameengine/Converter/KX_ConvertSensors.h
source/gameengine/Converter/KX_IpoConvert.h
source/gameengine/Converter/KX_SoftBodyDeformer.h
source/gameengine/Expressions/EXP_C-Api.h
source/gameengine/Expressions/IdentifierExpr.h
source/gameengine/Expressions/KX_HashedPtr.h
source/gameengine/Expressions/KX_Python.h
source/gameengine/Expressions/PyObjectPlus.h
source/gameengine/GameLogic/Joystick/SCA_Joystick.h
source/gameengine/GameLogic/Joystick/SCA_JoystickDefines.h
source/gameengine/GameLogic/SCA_2DFilterActuator.h
source/gameengine/GameLogic/SCA_ANDController.h
source/gameengine/GameLogic/SCA_ActuatorEventManager.h
source/gameengine/GameLogic/SCA_ActuatorSensor.h
source/gameengine/GameLogic/SCA_AlwaysEventManager.h
source/gameengine/GameLogic/SCA_AlwaysSensor.h
source/gameengine/GameLogic/SCA_BasicEventManager.h
source/gameengine/GameLogic/SCA_DelaySensor.h
source/gameengine/GameLogic/SCA_EventManager.h
source/gameengine/GameLogic/SCA_ExpressionController.h
source/gameengine/GameLogic/SCA_IActuator.h
source/gameengine/GameLogic/SCA_IController.h
source/gameengine/GameLogic/SCA_IInputDevice.h
source/gameengine/GameLogic/SCA_ILogicBrick.h
source/gameengine/GameLogic/SCA_IObject.h
source/gameengine/GameLogic/SCA_IScene.h
source/gameengine/GameLogic/SCA_ISensor.h
source/gameengine/GameLogic/SCA_JoystickManager.h
source/gameengine/GameLogic/SCA_KeyboardManager.h
source/gameengine/GameLogic/SCA_KeyboardSensor.h
source/gameengine/GameLogic/SCA_LogicManager.h
source/gameengine/GameLogic/SCA_MouseManager.h
source/gameengine/GameLogic/SCA_MouseSensor.h
source/gameengine/GameLogic/SCA_NANDController.h
source/gameengine/GameLogic/SCA_NORController.h
source/gameengine/GameLogic/SCA_ORController.h
source/gameengine/GameLogic/SCA_PropertyActuator.h
source/gameengine/GameLogic/SCA_PropertyEventManager.h
source/gameengine/GameLogic/SCA_PropertySensor.h
source/gameengine/GameLogic/SCA_PythonController.h
source/gameengine/GameLogic/SCA_PythonKeyboard.h
source/gameengine/GameLogic/SCA_PythonMouse.h
source/gameengine/GameLogic/SCA_RandomActuator.h
source/gameengine/GameLogic/SCA_RandomEventManager.h
source/gameengine/GameLogic/SCA_RandomNumberGenerator.h
source/gameengine/GameLogic/SCA_RandomSensor.h
source/gameengine/GameLogic/SCA_TimeEventManager.h
source/gameengine/GameLogic/SCA_XNORController.h
source/gameengine/GameLogic/SCA_XORController.h
source/gameengine/GamePlayer/common/GPC_Canvas.h
source/gameengine/GamePlayer/common/GPC_Engine.h
source/gameengine/GamePlayer/common/GPC_KeyboardDevice.h
source/gameengine/GamePlayer/common/GPC_MouseDevice.h
source/gameengine/GamePlayer/common/GPC_RawLoadDotBlendArray.h
source/gameengine/GamePlayer/common/GPC_RawLogoArrays.h
source/gameengine/GamePlayer/common/GPC_RenderTools.h
source/gameengine/GamePlayer/common/GPC_System.h
source/gameengine/GamePlayer/ghost/GPG_Canvas.h
source/gameengine/GamePlayer/ghost/GPG_KeyboardDevice.h
source/gameengine/GamePlayer/ghost/GPG_System.h
source/gameengine/Ketsji/BL_Action.h
source/gameengine/Ketsji/BL_ActionManager.h
source/gameengine/Ketsji/BL_BlenderShader.h
source/gameengine/Ketsji/KXNetwork/KX_NetworkEventManager.h
source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.h
source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.h
source/gameengine/Ketsji/KX_ArmatureSensor.h
source/gameengine/Ketsji/KX_BlenderMaterial.h
source/gameengine/Ketsji/KX_BulletPhysicsController.h
source/gameengine/Ketsji/KX_Camera.h
source/gameengine/Ketsji/KX_CameraActuator.h
source/gameengine/Ketsji/KX_CameraIpoSGController.h
source/gameengine/Ketsji/KX_ClientObjectInfo.h
source/gameengine/Ketsji/KX_ConstraintActuator.h
source/gameengine/Ketsji/KX_ConstraintWrapper.h
source/gameengine/Ketsji/KX_ConvertPhysicsObject.h
source/gameengine/Ketsji/KX_EmptyObject.h
source/gameengine/Ketsji/KX_FontObject.h
source/gameengine/Ketsji/KX_GameActuator.h
source/gameengine/Ketsji/KX_GameObject.h
source/gameengine/Ketsji/KX_IInterpolator.h
source/gameengine/Ketsji/KX_IPOTransform.h
source/gameengine/Ketsji/KX_IPO_SGController.h
source/gameengine/Ketsji/KX_IPhysicsController.h
source/gameengine/Ketsji/KX_IScalarInterpolator.h
source/gameengine/Ketsji/KX_ISceneConverter.h
source/gameengine/Ketsji/KX_ISystem.h
source/gameengine/Ketsji/KX_IpoActuator.h
source/gameengine/Ketsji/KX_KetsjiEngine.h
source/gameengine/Ketsji/KX_Light.h
source/gameengine/Ketsji/KX_LightIpoSGController.h
source/gameengine/Ketsji/KX_MeshProxy.h
source/gameengine/Ketsji/KX_MotionState.h
source/gameengine/Ketsji/KX_MouseFocusSensor.h
source/gameengine/Ketsji/KX_NavMeshObject.h
source/gameengine/Ketsji/KX_NearSensor.h
source/gameengine/Ketsji/KX_ObColorIpoSGController.h
source/gameengine/Ketsji/KX_ObjectActuator.h
source/gameengine/Ketsji/KX_ObstacleSimulation.h
source/gameengine/Ketsji/KX_OrientationInterpolator.h
source/gameengine/Ketsji/KX_ParentActuator.h
source/gameengine/Ketsji/KX_PhysicsEngineEnums.h
source/gameengine/Ketsji/KX_PhysicsObjectWrapper.h
source/gameengine/Ketsji/KX_PhysicsPropertiesobsolete.h
source/gameengine/Ketsji/KX_PositionInterpolator.h
source/gameengine/Ketsji/KX_PyConstraintBinding.h
source/gameengine/Ketsji/KX_PythonInit.h
source/gameengine/Ketsji/KX_RadarSensor.h
source/gameengine/Ketsji/KX_RayEventManager.h
source/gameengine/Ketsji/KX_RaySensor.h
source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h
source/gameengine/Ketsji/KX_SCA_DynamicActuator.h
source/gameengine/Ketsji/KX_SCA_EndObjectActuator.h
source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.h
source/gameengine/Ketsji/KX_SG_BoneParentNodeRelationship.h
source/gameengine/Ketsji/KX_SG_NodeRelationships.h
source/gameengine/Ketsji/KX_ScalarInterpolator.h
source/gameengine/Ketsji/KX_ScalingInterpolator.h
source/gameengine/Ketsji/KX_Scene.h
source/gameengine/Ketsji/KX_SceneActuator.h
source/gameengine/Ketsji/KX_SoundActuator.h
source/gameengine/Ketsji/KX_StateActuator.h
source/gameengine/Ketsji/KX_SteeringActuator.h
source/gameengine/Ketsji/KX_TimeCategoryLogger.h
source/gameengine/Ketsji/KX_TimeLogger.h
source/gameengine/Ketsji/KX_TouchEventManager.h
source/gameengine/Ketsji/KX_TouchSensor.h
source/gameengine/Ketsji/KX_TrackToActuator.h
source/gameengine/Ketsji/KX_VehicleWrapper.h
source/gameengine/Ketsji/KX_VertexProxy.h
source/gameengine/Ketsji/KX_VisibilityActuator.h
source/gameengine/Ketsji/KX_WorldInfo.h
source/gameengine/Ketsji/KX_WorldIpoController.h
source/gameengine/Network/LoopBackNetwork/NG_LoopBackNetworkDeviceInterface.h
source/gameengine/Network/NG_NetworkDeviceInterface.h
source/gameengine/Network/NG_NetworkMessage.h
source/gameengine/Network/NG_NetworkObject.h
source/gameengine/Network/NG_NetworkScene.h
source/gameengine/Physics/Bullet/CcdGraphicController.h
source/gameengine/Physics/Bullet/CcdPhysicsController.h
source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h
source/gameengine/Physics/common/PHY_DynamicTypes.h
source/gameengine/Physics/common/PHY_IController.h
source/gameengine/Physics/common/PHY_IGraphicController.h
source/gameengine/Physics/common/PHY_IMotionState.h
source/gameengine/Physics/common/PHY_IPhysicsController.h
source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h
source/gameengine/Physics/common/PHY_IVehicle.h
source/gameengine/Physics/common/PHY_Pro.h
source/gameengine/Rasterizer/RAS_2DFilterManager.h
source/gameengine/Rasterizer/RAS_BucketManager.h
source/gameengine/Rasterizer/RAS_CameraData.h
source/gameengine/Rasterizer/RAS_Deformer.h
source/gameengine/Rasterizer/RAS_FramingManager.h
source/gameengine/Rasterizer/RAS_ICanvas.h
source/gameengine/Rasterizer/RAS_IPolygonMaterial.h
source/gameengine/Rasterizer/RAS_IRasterizer.h
source/gameengine/Rasterizer/RAS_IRenderTools.h
source/gameengine/Rasterizer/RAS_LightObject.h
source/gameengine/Rasterizer/RAS_MaterialBucket.h
source/gameengine/Rasterizer/RAS_MeshObject.h
source/gameengine/Rasterizer/RAS_ObjectColor.h
source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Blur2DFilter.h
source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Dilation2DFilter.h
source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Erosion2DFilter.h
source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_GrayScale2DFilter.h
source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Invert2DFilter.h
source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Laplacian2DFilter.h
source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Prewitt2DFilter.h
source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Sepia2DFilter.h
source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Sharpen2DFilter.h
source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Sobel2DFilter.h
source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.h
source/gameengine/Rasterizer/RAS_Polygon.h
source/gameengine/Rasterizer/RAS_Rect.h
source/gameengine/Rasterizer/RAS_TexMatrix.h
source/gameengine/Rasterizer/RAS_TexVert.h
source/gameengine/SceneGraph/SG_Controller.h
source/gameengine/SceneGraph/SG_DList.h
source/gameengine/SceneGraph/SG_IObject.h
source/gameengine/SceneGraph/SG_Node.h
source/gameengine/SceneGraph/SG_ParentRelation.h
source/gameengine/SceneGraph/SG_QList.h
source/gameengine/SceneGraph/SG_Spatial.h

index 7e523ea9b2bf85219c3b89bc48c7242dd8775382..b9f51393f4409deafcc136b6f6ab1ddc26fc1f3b 100644 (file)
@@ -31,8 +31,8 @@
  *  \ingroup blroutines
  */
 
-#ifndef BL_SYSTEM_H
-#define BL_SYSTEM_H
+#ifndef __BL_SYSTEM_H__
+#define __BL_SYSTEM_H__
 
 #ifdef __cplusplus
 extern "C" {
@@ -66,5 +66,5 @@ extern void StartKetsjiShell(struct bContext *C, struct ARegion *ar,
 }
 #endif
 
-#endif /* BL_SYSTEM_H */
+#endif /* __BL_SYSTEM_H__ */
 
index 44dffb5bc5430f044c517ee203fa35d393be182d..184cc45f10388ed2cee227df7305173b2eac9737 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup blroutines
  */
 
-#ifndef __KX_BLENDERCANVAS
-#define __KX_BLENDERCANVAS
+#ifndef __KX_BLENDERCANVAS_H__
+#define __KX_BLENDERCANVAS_H__
 
 #ifdef WIN32
 #include <windows.h>
@@ -200,5 +200,5 @@ public:
 #endif
 };
 
-#endif // __KX_BLENDERCANVAS
+#endif // __KX_BLENDERCANVAS_H__
 
index 6d8e24077936a80161f62609cbcb020a7cbdb84c..3b89538df47aa0d4204a09d92547491d7de4f47e 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup blroutines
  */
 
-#ifndef __BLENDERGL
-#define __BLENDERGL
+#ifndef __KX_BLENDERGL_H__
+#define __KX_BLENDERGL_H__
 
 #ifdef __cplusplus
 extern "C" {
@@ -60,5 +60,5 @@ void BL_print_gamedebug_line_padded(const char* text, int xco, int yco, int widt
 }
 #endif //__cplusplus
 
-#endif //__BLENDERGL
+#endif //__KX_BLENDERGL_H__
 
index 93bf133635d26cd298fc7457f74603ee5b8dbc1b..18f163d727459c5a7a5c1f5db1539787f0885ec0 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup blroutines
  */
 
-#ifndef __KX_BLENDERINPUTDEVICE
-#define __KX_BLENDERINPUTDEVICE
+#ifndef __KX_BLENDERINPUTDEVICE_H__
+#define __KX_BLENDERINPUTDEVICE_H__
 
 #if defined(WIN32) && !defined(FREE_WINDOWS)
 #pragma warning(disable : 4786)  // shut off 255 char limit debug template warning
@@ -77,5 +77,5 @@ public:
        void operator delete(void *mem) { MEM_freeN(mem); }
 #endif
 };
-#endif //__KX_BLENDERINPUTDEVICE
+#endif //__KX_BLENDERINPUTDEVICE_H__
 
index 3039e69efcdd36894bf50e9173100e91155616c8..84991b9a9ad573dd33243bcde6737621d92f82c8 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup blroutines
  */
 
-#ifndef __KX_BLENDERKEYBOARDDEVICE
-#define __KX_BLENDERKEYBOARDDEVICE
+#ifndef __KX_BLENDERKEYBOARDDEVICE_H__
+#define __KX_BLENDERKEYBOARDDEVICE_H__
 
 #include "KX_BlenderInputDevice.h"
 
@@ -61,5 +61,5 @@ public:
 #endif
 };
 
-#endif //__KX_BLENDERKEYBOARDDEVICE
+#endif //__KX_BLENDERKEYBOARDDEVICE_H__
 
index 9f0277fbc07cc986c129c75a6e4d34f43f62f2c8..1c54b2fc00061ca473968e191a24a7298e397841 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup blroutines
  */
 
-#ifndef __KX_BLENDERMOUSEDEVICE
-#define __KX_BLENDERMOUSEDEVICE
+#ifndef __KX_BLENDERMOUSEDEVICE_H__
+#define __KX_BLENDERMOUSEDEVICE_H__
 
 #include "KX_BlenderInputDevice.h"
 
@@ -57,5 +57,5 @@ public:
 #endif
 };
 
-#endif //__KX_BLENDERMOUSEDEVICE
+#endif //__KX_BLENDERMOUSEDEVICE_H__
 
index f259e0ca1c3081b5c2c739ff0799c1aa04976b1c..a470e029758891b4c18c82f2a8ea82748b0fac37 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup blroutines
  */
 
-#ifndef __KX_BLENDERRENDERTOOLS
-#define __KX_BLENDERRENDERTOOLS
+#ifndef __KX_BLENDERRENDERTOOLS_H__
+#define __KX_BLENDERRENDERTOOLS_H__
 
 #if defined(WIN32) && !defined(FREE_WINDOWS)
 // don't show stl-warnings
@@ -114,7 +114,7 @@ public:
 #endif
 };
 
-#endif //__KX_BLENDERRENDERTOOLS
+#endif //__KX_BLENDERRENDERTOOLS_H__
 
 
 
index 526a7b12fbb0d801e21c6a4b7f896a960f3c04bc..90685e426e6d803fea2fe2e4db973e2e84f87881 100644 (file)
@@ -30,8 +30,8 @@
  *  \brief Blender System embedding. Needed when gameengine runs embedded within Blender.
  */
 
-#ifndef __KX_BLENDERSYSTEM
-#define __KX_BLENDERSYSTEM
+#ifndef __KX_BLENDERSYSTEM_H__
+#define __KX_BLENDERSYSTEM_H__
 
 #include "KX_ISystem.h"
 
@@ -55,5 +55,5 @@ public:
 #endif
 };
 
-#endif //__KX_BLENDERSYSTEM
+#endif //__KX_BLENDERSYSTEM_H__
 
index 29300281bb5ceaca4306e005b3ef9a6e116ee400..640a9a9ccb7dbf3e534d94e6a5761ffbd1e8abce 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup bgeconv
  */
 
-#ifndef BL_ACTIONACTUATOR
-#define BL_ACTIONACTUATOR
+#ifndef __BL_ACTIONACTUATOR_H__
+#define __BL_ACTIONACTUATOR_H__
 
 #include "CTR_HashedPtr.h"
 #include "SCA_IActuator.h"
index 344b76ec278ea13c50fcdb3ff534dc72aecb91f2..761d429f784ab48044581e5378005f388555def9 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup bgeconv
  */
 
-#ifndef BL_ARMATUREACTUATOR
-#define BL_ARMATUREACTUATOR
+#ifndef __BL_ARMATUREACTUATOR_H__
+#define __BL_ARMATUREACTUATOR_H__
 
 #include "SCA_IActuator.h"
 #include "BL_ArmatureConstraint.h"
@@ -91,6 +91,6 @@ private:
        int                             m_type;
 };
 
-#endif //BL_ARMATUREACTUATOR
+#endif //__BL_ARMATUREACTUATOR_H__
 
 
index 585b6093a2b8b8aa2f84a424e386c10fcb52747a..3fd49c276ae8e909552019316f971b42540913e2 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup bgeconv
  */
 
-#ifndef __BL_ARMATURECHANNEL
-#define __BL_ARMATURECHANNEL
+#ifndef __BL_ARMATURECHANNEL_H__
+#define __BL_ARMATURECHANNEL_H__
 
 #include "DNA_action_types.h"
 #include "CTR_HashedPtr.h"
@@ -94,5 +94,5 @@ public:
 };
 
 
-#endif //__BL_ARMATURECHANNEL
+#endif //__BL_ARMATURECHANNEL_H__
 
index 2abb36ff937d49fd7dcde503f16196d59c3ca8c0..89bad520563e8bdc21e90df3b6f126df2b8899d0 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup bgeconv
  */
 
-#ifndef __BL_ARMATURECONSTRAINT
-#define __BL_ARMATURECONSTRAINT
+#ifndef __BL_ARMATURECONSTRAINT_H__
+#define __BL_ARMATURECONSTRAINT_H__
 
 #include "DNA_constraint_types.h"
 #include "CTR_HashedPtr.h"
@@ -117,5 +117,5 @@ public:
 #endif // WITH_PYTHON
 };
 
-#endif //__BL_ARMATURECONSTRAINT
+#endif //__BL_ARMATURECONSTRAINT_H__
 
index 745ffac0cb2466a9618adafa232ba73e6eda0d9d..a6848cf57dfc8afdcbd4a207d32c89797bbdfcf5 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup bgeconv
  */
 
-#ifndef BL_ARMATUREOBJECT
-#define BL_ARMATUREOBJECT
+#ifndef __BL_ARMATUREOBJECT_H__
+#define __BL_ARMATUREOBJECT_H__
 
 #include "KX_GameObject.h"
 #include "BL_ArmatureConstraint.h"
index 6da3ac90aef5ff9312822af15ae298321362b5a8..e6c35c20f4cb843444045d20faca2233c8832e19 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup bgeconv
  */
 
-#ifndef __BLENDER_CONVERT
-#define __BLENDER_CONVERT
+#ifndef __BL_BLENDERDATACONVERSION_H__
+#define __BL_BLENDERDATACONVERSION_H__
 
 #include "CTR_HashedPtr.h"
 #include "STR_String.h"
@@ -52,5 +52,5 @@ void BL_ConvertBlenderObjects(struct Main* maggie,
 
 SCA_IInputDevice::KX_EnumInputs ConvertKeyCode(int key_code);
 
-#endif // __BLENDER_CONVERT
+#endif // __BL_BLENDERDATACONVERSION_H__
 
index e86fff4fe69e5adfa7c9c14fc31aaebeb061e23d..b86069bca1b2770ba835646576fb216e65c23223 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup bgeconv
  */
 
-#ifndef BL_DEFORMABLEGAMEOBJECT
-#define BL_DEFORMABLEGAMEOBJECT
+#ifndef __BL_DEFORMABLEGAMEOBJECT_H__
+#define __BL_DEFORMABLEGAMEOBJECT_H__
 
 #if defined(WIN32) && !defined(FREE_WINDOWS)
 #pragma warning (disable:4786) // get rid of stupid stl-visual compiler debug warning
index 9c2065bddb8b55d1a81bcf247f1c870d09347dfe..48775d6031a45407418cd1e736c2a679d66df354 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup bgeconv
  */
 
-#ifndef BL_MESHDEFORMER
-#define BL_MESHDEFORMER
+#ifndef __BL_MESHDEFORMER_H__
+#define __BL_MESHDEFORMER_H__
 
 #include "RAS_Deformer.h"
 #include "DNA_object_types.h"
index c9cd9153153c9d8eda9019176da21f5d735cfa3b..163b2dd108f4fc141bc9174e5388fdd19e1a5d9a 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup bgeconv
  */
 
-#ifndef BL_MODIFIERDEFORMER
-#define BL_MODIFIERDEFORMER
+#ifndef __BL_MODIFIERDEFORMER_H__
+#define __BL_MODIFIERDEFORMER_H__
 
 #if defined(WIN32) && !defined(FREE_WINDOWS)
 #pragma warning (disable:4786) // get rid of stupid stl-visual compiler debug warning
index 90f44acb672890e70c3b9505f2b50802690bcba1..b88631c89d6e7a538ae7c2e6e975d1f4f2fad331 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup bgeconv
  */
 
-#ifndef BL_SHAPEACTIONACTUATOR
-#define BL_SHAPEACTIONACTUATOR
+#ifndef __BL_SHAPEACTIONACTUATOR_H__
+#define __BL_SHAPEACTIONACTUATOR_H__
 
 #include "CTR_HashedPtr.h"
 #include "SCA_IActuator.h"
index c768b2e1e75604eb7ec613bf1651685a139f70a4..6b55d5b26f94c454003f45d4e0cfc5e2f6db76f9 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup bgeconv
  */
 
-#ifndef BL_SHAPEDEFORMER
-#define BL_SHAPEDEFORMER
+#ifndef __BL_SHAPEDEFORMER_H__
+#define __BL_SHAPEDEFORMER_H__
 
 #if defined(WIN32) && !defined(FREE_WINDOWS)
 #pragma warning (disable:4786) // get rid of stupid stl-visual compiler debug warning
index afec027e0992eca98989a349881d1478d03204bb..dd8577b382e251266e14cd90c96e7314cc40d6e5 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup bgeconv
  */
 
-#ifndef BL_SKINDEFORMER
-#define BL_SKINDEFORMER
+#ifndef __BL_SKINDEFORMER_H__
+#define __BL_SKINDEFORMER_H__
 
 #if defined(WIN32) && !defined(FREE_WINDOWS)
 #pragma warning (disable:4786) // get rid of stupid stl-visual compiler debug warning
index 5d6ee6eaf19501c038962e56165af9acdc0d3872..e6f274b777e2a9ed6f99510644894a59232f30fa 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup bgeconv
  */
 
-#ifndef __BLENDERWORLDINFO_H
-#define __BLENDERWORLDINFO_H
+#ifndef __BLENDERWORLDINFO_H__
+#define __BLENDERWORLDINFO_H__
 #include "MT_CmMatrix4x4.h"
 #include "KX_WorldInfo.h"
 #include "KX_BlenderGL.h"
@@ -106,5 +106,5 @@ public:
 #endif
 };
 
-#endif //__BLENDERWORLDINFO_H
+#endif //__BLENDERWORLDINFO_H__
 
index 23aef75e48f18a17a9b61b3df847041b80ec9bef..fc08d3b54d691257ba11c2080a555c84f141891e 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup bgeconv
  */
 
-#ifndef __KX_SCALARINTERPOLATOR_H
-#define __KX_SCALARINTERPOLATOR_H
+#ifndef __KX_BLENDERSCALARINTERPOLATOR_H__
+#define __KX_BLENDERSCALARINTERPOLATOR_H__
 
 #include <vector>
 
@@ -77,5 +77,5 @@ public:
 #endif
 };
 
-#endif //__KX_SCALARINTERPOLATOR_H
+#endif //__KX_BLENDERSCALARINTERPOLATOR_H__
 
index 9c2143d2cabbae14b625dbf18ab642046e85e2f4..f3c4627693bcc004af104e93915e26b157e6920b 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup bgeconv
  */
 
-#ifndef __KX_BLENDERSCENECONVERTER_H
-#define __KX_BLENDERSCENECONVERTER_H
+#ifndef __KX_BLENDERSCENECONVERTER_H__
+#define __KX_BLENDERSCENECONVERTER_H__
 
 #include "KX_HashedPtr.h"
 #include "CTR_Map.h"
@@ -197,5 +197,5 @@ public:
 #endif
 };
 
-#endif //__KX_BLENDERSCENECONVERTER_H
+#endif //__KX_BLENDERSCENECONVERTER_H__
 
index 836bcd860fa49452ee1c6c5820650dd678cc12ce..b7c890458ccc1c490772fde3d72bfa164596b989 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup bgeconv
  */
 
-#ifndef __KX_CONVERTACTUATORS_H
-#define __KX_CONVERTACTUATORS_H
+#ifndef __KX_CONVERTACTUATORS_H__
+#define __KX_CONVERTACTUATORS_H__
 
 void BL_ConvertActuators(const char* maggiename,
         struct Object* blenderobject,
@@ -44,5 +44,5 @@ void BL_ConvertActuators(const char* maggiename,
         class KX_BlenderSceneConverter* converter);
 
 
-#endif //__KX_CONVERTACTUATORS_H
+#endif //__KX_CONVERTACTUATORS_H__
 
index 19045dc26d15627644d642f93fd9ff133ef5cc50..d1d52f866ec4e8d8805556d89229c84898e82cae 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup bgeconv
  */
 
-#ifndef __KX_CONVERTCONTROLLERS_H
-#define __KX_CONVERTCONTROLLERS_H
+#ifndef __KX_CONVERTCONTROLLERS_H__
+#define __KX_CONVERTCONTROLLERS_H__
 
 #include "KX_Python.h"
 
@@ -44,5 +44,5 @@ void BL_ConvertControllers(
 );
 
 
-#endif //__KX_CONVERTCONTROLLERS_H
+#endif //__KX_CONVERTCONTROLLERS_H__
 
index b151b70019d1aab64adbb82a4b10c6e4ea657cee..5bfe202a539d59cda82cda94d5a8897543f0a507 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup bgeconv
  */
 
-#ifndef __KX_CONVERTPROPERTIES
-#define __KX_CONVERTPROPERTIES
+#ifndef __KX_CONVERTPROPERTIES_H__
+#define __KX_CONVERTPROPERTIES_H__
 
 void BL_ConvertProperties(struct Object* object,
   class KX_GameObject* gameobj,
@@ -38,5 +38,5 @@ void BL_ConvertProperties(struct Object* object,
   class SCA_IScene* scene,
   bool isInActiveLayer);
 
-#endif //__KX_CONVERTPROPERTIES
+#endif //__KX_CONVERTPROPERTIES_H__
 
index 1405aee8701b7cfcfc9caf5de92ee45e9e375a95..0694815c77e503e308340275ce27ca3c797513a3 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup bgeconv
  */
 
-#ifndef __KX_CONVERTSENSOR_H
-#define __KX_CONVERTSENSOR_H
+#ifndef __KX_CONVERTSENSORS_H__
+#define __KX_CONVERTSENSORS_H__
 
 void BL_ConvertSensors(struct Object* blenderobject,
           class KX_GameObject* gameobj,
@@ -42,5 +42,5 @@ void BL_ConvertSensors(struct Object* blenderobject,
           class RAS_ICanvas* canvas, 
           class KX_BlenderSceneConverter* converter);
 
-#endif //__KX_CONVERTSENSOR_H
+#endif //__KX_CONVERTSENSORS_H__
 
index 49ac6f0b89a8a0db269dd1661fcb43e8125814c1..7bb2df978f6bcfa014fb77460d3f8f368a42dbd9 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup bgeconv
  */
 
-#ifndef __KX_IPOCONVERT_H
-#define __KX_IPOCONVERT_H
+#ifndef __KX_IPOCONVERT_H__
+#define __KX_IPOCONVERT_H__
 
 struct Object;
 
@@ -66,5 +66,5 @@ void BL_ConvertMaterialIpos(struct Object* blenderobject,
        class KX_BlenderSceneConverter *converter);
 
 
-#endif //__KX_IPOCONVERT_H
+#endif //__KX_IPOCONVERT_H__
 
index 6e3ca73950101e1a00c5643f6969a1796916485d..5235c91ce891b5529dd36c3888252007959e167c 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup bgeconv
  */
 
-#ifndef KX_SOFTBODYDEFORMER
-#define KX_SOFTBODYDEFORMER
+#ifndef __KX_SOFTBODYDEFORMER_H__
+#define __KX_SOFTBODYDEFORMER_H__
 
 #if defined(WIN32) && !defined(FREE_WINDOWS)
 #pragma warning (disable:4786) // get rid of stupid stl-visual compiler debug warning
index 2f179547a2b78976eea38c9280a87adf3f81d8c1..6be1e57481c01c70a9e30f253aad1c4e4b7cf0dc 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup expressions
  */
 
-#ifndef __EXPRESSION_INCLUDE
-#define __EXPRESSION_INCLUDE
+#ifndef __EXP_C_API_H__
+#define __EXP_C_API_H__
 
 #define EXP_DECLARE_HANDLE(name) typedef struct name##__ { int unused; } *name
 
@@ -64,5 +64,5 @@ const char*                                   EXP_GetText(EXP_ValueHandle);
 }
 #endif
 
-#endif //__EXPRESSION_INCLUDE
+#endif //__EXP_C_API_H__
 
index bf996f5e2f050372ef1337a754b110d4f3a25e23..632a1e0a6d9c8db66c19b87ee36d701e2def3cd3 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup expressions
  */
 
-#ifndef __IDENTIFIER_EXPR
-#define __IDENTIFIER_EXPR
+#ifndef __IDENTIFIEREXPR_H__
+#define __IDENTIFIEREXPR_H__
 
 #include "Expression.h"
 
@@ -58,5 +58,5 @@ public:
 #endif
 };
 
-#endif //__IDENTIFIER_EXPR
+#endif //__IDENTIFIEREXPR_H__
 
index 8f2b524b595a77ba33f9505bb19c0e2fdae146ee..edb68f2861d64f17cb1ed94dfc0752515b0bb1d5 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup expressions
  */
 
-#ifndef __KX_HASHEDPTR
-#define __KX_HASHEDPTR
+#ifndef __KX_HASHEDPTR_H__
+#define __KX_HASHEDPTR_H__
 
 #ifdef WITH_CXX_GUARDEDALLOC
 #include "MEM_guardedalloc.h"
@@ -60,5 +60,5 @@ public:
 #endif
 };
 
-#endif //__KX_HASHEDPTR
+#endif //__KX_HASHEDPTR_H__
 
index 98f8d922beaa0ecba254f2e3c59b7ff08c966cd8..4a7ce4d3fb75b7857246a101921300d6a3b235ef 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup expressions
  */
 
-#ifndef KX_PYTHON_H
-#define KX_PYTHON_H
+#ifndef __KX_PYTHON_H__
+#define __KX_PYTHON_H__
 
 //#define USE_DL_EXPORT
 
@@ -79,5 +79,5 @@
 #undef toupper
 #endif
 
-#endif // KX_PYTHON_H
+#endif // __KX_PYTHON_H__
 
index 107ae453c8e7a63776bc37bb0b93a06005b50438..27c948ecaa9cd18b33bd6f1f463d6c9657b0cac0 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup expressions
  */
 
-#ifndef _PY_OBJECT_PLUS_H
-#define _PY_OBJECT_PLUS_H
+#ifndef __PYOBJECTPLUS_H__
+#define __PYOBJECTPLUS_H__
 
 /* for now keep weakrefs optional */
 #define USE_WEAKREFS
@@ -652,4 +652,4 @@ PyObject *py_getattr_dict(PyObject *pydict, PyObject *tp_dict);
 PyObject *PyUnicode_From_STR_String(const STR_String& str);
 #endif
 
-#endif //  _PY_OBJECT_PLUS_H
+#endif //  __PYOBJECTPLUS_H__
index 4e3e3ef656d51daba98578e1bcb0ff768cd0e262..75a7ff73b4c3bbead66018aaa6755b6a5ec355cd 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup gamelogic
  */
 
-#ifndef _SCA_JOYSTICK_H_
-#define _SCA_JOYSTICK_H_
+#ifndef __SCA_JOYSTICK_H__
+#define __SCA_JOYSTICK_H__
 
 #include "SCA_JoystickDefines.h"
 #ifdef WITH_SDL
index 69fc393cbd75899c221d35840979d4103c131b20..45766eb9057b19651f948d515b581dcc9c2e2b5c 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup gamelogic
  */
 
-#ifndef _SCA_JOYSTICKDEFINES_H_
-#define _SCA_JOYSTICKDEFINES_H_
+#ifndef __SCA_JOYSTICKDEFINES_H__
+#define __SCA_JOYSTICKDEFINES_H__
 
 #ifdef main
 #undef main
index 42446b7a2b1ec77ad8d6a6d499692e5b6ddf0e72..a754d950859a754f3706db2b632617c79f263f1a 100644 (file)
@@ -28,8 +28,8 @@
  *  \ingroup gamelogic
  */
 
-#ifndef __SCA_2DFILETRACTUATOR_H__
-#define __SCA_2DFILETRACTUATOR_H__
+#ifndef __SCA_2DFILTERACTUATOR_H__
+#define __SCA_2DFILTERACTUATOR_H__
 
 #include "RAS_IRasterizer.h"
 #include "SCA_IActuator.h"
index 363bca630aa1e7be49960221857ad0fbbbaf3f34..ccc3f9be3afee212881ae7b597cbaa820dd88160 100644 (file)
@@ -32,8 +32,8 @@
  *  \ingroup gamelogic
  */
 
-#ifndef __KX_ANDCONTROLLER
-#define __KX_ANDCONTROLLER
+#ifndef __SCA_ANDCONTROLLER_H__
+#define __SCA_ANDCONTROLLER_H__
 
 #include "SCA_IController.h"
 
@@ -48,5 +48,5 @@ public:
        virtual void Trigger(SCA_LogicManager* logicmgr);
 };
 
-#endif //__KX_ANDCONTROLLER
+#endif //__SCA_ANDCONTROLLER_H__
 
index f4d2d7dfd7da6e5cf9a8517d898cd8ffb596fb70..b91e6f872a202d6cf149bf6da85ea3efdc6c3e75 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup gamelogic
  */
 
-#ifndef __KX_ACTUATOREVENTMANAGER
-#define __KX_ACTUATOREVENTMANAGER
+#ifndef __SCA_ACTUATOREVENTMANAGER_H__
+#define __SCA_ACTUATOREVENTMANAGER_H__
 
 #include "SCA_EventManager.h"
 
@@ -55,5 +55,5 @@ public:
 #endif
 };
 
-#endif //__KX_ACTUATOREVENTMANAGER
+#endif //__SCA_ACTUATOREVENTMANAGER_H__
 
index e7a7525bb40a97242235f1f21fd6ebb102be35de..e40c2492b8a4cf93d4d85c3cd15d1976f44681cc 100644 (file)
@@ -32,8 +32,8 @@
  *  \ingroup gamelogic
  */
 
-#ifndef __KX_ACTUATORSENSOR
-#define __KX_ACTUATORSENSOR
+#ifndef __SCA_ACTUATORSENSOR_H__
+#define __SCA_ACTUATORSENSOR_H__
 
 #include "SCA_ISensor.h"
 #include "SCA_IActuator.h"
index 2801d64923785628a3efd92d6255530807295600..21ac55d36a4efbdb5a7442e308292dad820a7a88 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup gamelogic
  */
 
-#ifndef __KX_ALWAYSEVENTMGR
-#define __KX_ALWAYSEVENTMGR
+#ifndef __SCA_ALWAYSEVENTMANAGER_H__
+#define __SCA_ALWAYSEVENTMANAGER_H__
 #include "SCA_EventManager.h"
 #include <vector>
 
@@ -49,5 +49,5 @@ public:
 #endif
 };
 
-#endif //__KX_ALWAYSEVENTMGR
+#endif //__SCA_ALWAYSEVENTMANAGER_H__
 
index 8748793d9a329bf3087eea8f7fb83abfd4527512..d0963fd0ea129975dd7a73006dcac6fe6496b1c8 100644 (file)
@@ -32,8 +32,8 @@
  *  \ingroup gamelogic
  */
 
-#ifndef __KX_ALWAYSSENSOR
-#define __KX_ALWAYSSENSOR
+#ifndef __SCA_ALWAYSSENSOR_H__
+#define __SCA_ALWAYSSENSOR_H__
 #include "SCA_ISensor.h"
 
 class SCA_AlwaysSensor : public SCA_ISensor
@@ -50,5 +50,5 @@ public:
        virtual void Init();
 };
 
-#endif //__KX_ALWAYSSENSOR
+#endif //__SCA_ALWAYSSENSOR_H__
 
index 73e3babbdcf1d6283cf9c6d3ab91ae473be563b5..9d08a7785e24969b0317bf7a000604a25911c4ae 100644 (file)
@@ -32,8 +32,8 @@
  *  \ingroup gamelogic
  */
 
-#ifndef __SCA_BASICEVENTMGR
-#define __SCA_BASICEVENTMGR
+#ifndef __SCA_BASICEVENTMANAGER_H__
+#define __SCA_BASICEVENTMANAGER_H__
 
 #include "SCA_EventManager.h"
 #include <vector>
@@ -56,5 +56,5 @@ public:
 #endif
 };
 
-#endif //__SCA_BASICEVENTMGR
+#endif //__SCA_BASICEVENTMANAGER_H__
 
index ccb8f00c548d45376fe0c9870996d9a5e9b68a78..2c408921f27523ad37a1b0f8da5274975b8bc3e1 100644 (file)
@@ -32,8 +32,8 @@
  *  \ingroup gamelogic
  */
 
-#ifndef __KX_DELAYSENSOR
-#define __KX_DELAYSENSOR
+#ifndef __SCA_DELAYSENSOR_H__
+#define __SCA_DELAYSENSOR_H__
 #include "SCA_ISensor.h"
 
 class SCA_DelaySensor : public SCA_ISensor
index ea24b5c038bbe05ce6ca22a5eca3390276bddf7d..933fdc5190ac2e478024365edfad85afdfdd535e 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup gamelogic
  */
 
-#ifndef __KX_EVENTMANAGER
-#define __KX_EVENTMANAGER
+#ifndef __SCA_EVENTMANAGER_H__
+#define __SCA_EVENTMANAGER_H__
 
 #include <vector>
 #include <set>
index 93a3f08c95fb55e6e618155015147568039d2edc..47401ea58076163a2cc3e52bf30de354ee203ee6 100644 (file)
@@ -32,8 +32,8 @@
  *  \ingroup gamelogic
  */
 
-#ifndef __KX_EXPRESSIONCONTROLLER
-#define __KX_EXPRESSIONCONTROLLER
+#ifndef __SCA_EXPRESSIONCONTROLLER_H__
+#define __SCA_EXPRESSIONCONTROLLER_H__
 
 #include "SCA_IController.h"
 
@@ -65,5 +65,5 @@ public:
 #endif
 };
 
-#endif //__KX_EXPRESSIONCONTROLLER
+#endif //__SCA_EXPRESSIONCONTROLLER_H__
 
index feb21a721d5652102e530b75943ddba14726350e..211a25b84c88db049579404115c6f10195e970ce 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup gamelogic
  */
 
-#ifndef __KX_IACTUATOR
-#define __KX_IACTUATOR
+#ifndef __SCA_IACTUATOR_H__
+#define __SCA_IACTUATOR_H__
 
 #include "SCA_IController.h"
 #include <vector>
@@ -166,5 +166,5 @@ public:
 #endif
 };
 
-#endif //__KX_IACTUATOR
+#endif //__SCA_IACTUATOR_H__
 
index 5481f2ae8e489203f5eb226207adf86a132a72a2..1b15547d89830446ab5ef26d67d295b417891589 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup gamelogic
  */
 
-#ifndef __KX_ICONTROLLER
-#define __KX_ICONTROLLER
+#ifndef __SCA_ICONTROLLER_H__
+#define __SCA_ICONTROLLER_H__
 
 #include "SCA_ILogicBrick.h"
 #include "PyObjectPlus.h"
index 5c36d88e29ddc05801572cddc44858fdb0350a4b..ee9fa97c992805206823e18f6aa8b2bd8f211842 100644 (file)
@@ -32,8 +32,8 @@
  *
  */
 
-#ifndef KX_INPUTDEVICE_H
-#define KX_INPUTDEVICE_H
+#ifndef __SCA_IINPUTDEVICE_H__
+#define __SCA_IINPUTDEVICE_H__
 
 #ifdef WITH_CXX_GUARDEDALLOC
 #include "MEM_guardedalloc.h"
@@ -322,5 +322,5 @@ public:
 #endif
 };
 
-#endif //KX_INPUTDEVICE_H
+#endif //__SCA_IINPUTDEVICE_H__
 
index 051bc2aafceb26280e72c470c8f0b0f8da516528..9a23244fa96b91f10efbdbeffd003d02edebeeac 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup gamelogic
  */
 
-#ifndef __KX_ILOGICBRICK
-#define __KX_ILOGICBRICK
+#ifndef __SCA_ILOGICBRICK_H__
+#define __SCA_ILOGICBRICK_H__
 
 #include "Value.h"
 #include "SCA_IObject.h"
index b0a03de124289e7518a429b06a6d13c129715f6a..0e657794195bd410495532ca4db3c6d2a0270d8d 100644 (file)
@@ -31,8 +31,8 @@
  *   SceneGraph
  */
 
-#ifndef SCA_IOBJECT_H
-#define SCA_IOBJECT_H
+#ifndef __SCA_IOBJECT_H__
+#define __SCA_IOBJECT_H__
 
 #include "Value.h"
 #include <vector>
@@ -225,5 +225,5 @@ public:
 
 };
 
-#endif //SCA_IOBJECT_H
+#endif //__SCA_IOBJECT_H__
 
index 6f048b77acfb44d5d3bfd4ff21c9abf24d4a46e7..e7806ea0746604919e1d5b8bcf08fa749ff4ba5f 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup gamelogic
  */
 
-#ifndef __KX_ISCENE_H
-#define __KX_ISCENE_H
+#ifndef __SCA_ISCENE_H__
+#define __SCA_ISCENE_H__
 
 #include <vector>
 
@@ -80,5 +80,5 @@ public:
 #endif
 };
 
-#endif //__KX_ISCENE_H
+#endif //__SCA_ISCENE_H__
 
index ef082095c0dd73438fe461ca81817b100df6fc42..1e10bcc08fd788d026e12de696a9531e652ef54b 100644 (file)
@@ -31,8 +31,8 @@
  *   pulsemode and pulsefrequency, and event suppression.
  */
 
-#ifndef __SCA_ISENSOR
-#define __SCA_ISENSOR
+#ifndef __SCA_ISENSOR_H__
+#define __SCA_ISENSOR_H__
 
 #include "SCA_IController.h"
 
@@ -215,5 +215,5 @@ public:
 #endif // WITH_PYTHON
 };
 
-#endif //__SCA_ISENSOR
+#endif //__SCA_ISENSOR_H__
 
index dc778f231af45df28e637d91aa2fbb58c0aeff71..dcdd667cb1a300c07c65064bde6b10cf4f601c6d 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup gamelogic
  */
 
-#ifndef __JOYSTICKMANAGER_H_
-#define __JOYSTICKMANAGER_H_
+#ifndef __SCA_JOYSTICKMANAGER_H__
+#define __SCA_JOYSTICKMANAGER_H__
 
 #include "SCA_EventManager.h"
 #include "Joystick/SCA_Joystick.h"
index 55dd189d9d10cc1ad932513c2712b0da08c56bf8..5706d16ae195bdf62bc7b456abe24d0c517ef433 100644 (file)
@@ -31,8 +31,8 @@
  *
  */
 
-#ifndef __KX_KEYBOARDMANAGER
-#define __KX_KEYBOARDMANAGER
+#ifndef __SCA_KEYBOARDMANAGER_H__
+#define __SCA_KEYBOARDMANAGER_H__
 
 
 #include "SCA_EventManager.h"
@@ -65,5 +65,5 @@ public:
 #endif
 };
 
-#endif //__KX_KEYBOARDMANAGER
+#endif //__SCA_KEYBOARDMANAGER_H__
 
index 441c833d3a870b9e508c57cfd0fa3e8dbb7866b8..8e21d6bfde1a67c620817e88d17578456875227d 100644 (file)
@@ -30,8 +30,8 @@
  *  \brief Sensor for keyboard input
  */
 
-#ifndef __KX_KEYBOARDSENSOR
-#define __KX_KEYBOARDSENSOR
+#ifndef __SCA_KEYBOARDSENSOR_H__
+#define __SCA_KEYBOARDSENSOR_H__
 
 #include "SCA_ISensor.h"
 #include "BoolValue.h"
@@ -137,7 +137,7 @@ bool IsPrintable(int keyIndex);
 bool IsDelete(int keyIndex);
 
 
-#endif //__KX_KEYBOARDSENSOR
+#endif //__SCA_KEYBOARDSENSOR_H__
 
 
 
index ec8343075d868a02ce93ced714d93c8ea9f30686..8671aa6c7965abb46aee22330ba5cb8775d65f68 100644 (file)
@@ -28,8 +28,8 @@
  *  \ingroup gamelogic
  *  \brief Regulates the top-level logic behaviour for one scene.
  */
-#ifndef __KX_LOGICMANAGER
-#define __KX_LOGICMANAGER
+#ifndef __SCA_LOGICMANAGER_H__
+#define __SCA_LOGICMANAGER_H__
 
 #if defined(WIN32) && !defined(FREE_WINDOWS)
 #pragma warning (disable:4786)
@@ -153,5 +153,5 @@ public:
 #endif
 };
 
-#endif //__KX_LOGICMANAGER
+#endif //__SCA_LOGICMANAGER_H__
 
index d22d27be3949c4bd6dc47db60717e0736bff31f6..66a838651c2725ebecd26b8aa833688f58585014 100644 (file)
@@ -32,8 +32,8 @@
  */
 
 
-#ifndef __KX_MOUSEMANAGER
-#define __KX_MOUSEMANAGER
+#ifndef __SCA_MOUSEMANAGER_H__
+#define __SCA_MOUSEMANAGER_H__
 
 
 #include "SCA_EventManager.h"
@@ -74,5 +74,5 @@ public:
 #endif
 };
 
-#endif //__KX_MOUSEMANAGER
+#endif //__SCA_MOUSEMANAGER_H__
 
index 91352ce58bc251765bf1fb66edd1b0aa02010af1..d4eff371d4a4b74329894dda05ed54429d6fb771 100644 (file)
@@ -30,8 +30,8 @@
  *  \brief Senses mouse events
  */
 
-#ifndef __KX_MOUSESENSOR
-#define __KX_MOUSESENSOR
+#ifndef __SCA_MOUSESENSOR_H__
+#define __SCA_MOUSESENSOR_H__
 
 #include "SCA_ISensor.h"
 #include "BoolValue.h"
@@ -117,5 +117,5 @@ class SCA_MouseSensor : public SCA_ISensor
 #endif
 };
 
-#endif //__KX_MOUSESENSOR
+#endif //__SCA_MOUSESENSOR_H__
 
index 723d2a5fe0d6fe15f9cd7c3365b57f0d0bb2f942..040df7f0ade89e9637fed68be26535461674dd50 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup gamelogic
  */
 
-#ifndef __KX_NANDCONTROLLER
-#define __KX_NANDCONTROLLER
+#ifndef __SCA_NANDCONTROLLER_H__
+#define __SCA_NANDCONTROLLER_H__
 
 #include "SCA_IController.h"
 
@@ -49,5 +49,5 @@ public:
        /* --------------------------------------------------------------------- */
 };
 
-#endif //__KX_NANDCONTROLLER
+#endif //__SCA_NANDCONTROLLER_H__
 
index 26d7e92592337693b15fbc29292424714f2d6b98..1630f8055ec2312e049baa591b8da85bab5bc45d 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup gamelogic
  */
 
-#ifndef __KX_NORCONTROLLER
-#define __KX_NORCONTROLLER
+#ifndef __SCA_NORCONTROLLER_H__
+#define __SCA_NORCONTROLLER_H__
 
 #include "SCA_IController.h"
 
@@ -45,5 +45,5 @@ public:
        virtual void Trigger(SCA_LogicManager* logicmgr);
 };
 
-#endif //__KX_NORCONTROLLER
+#endif //__SCA_NORCONTROLLER_H__
 
index 53debf894a36343293464dc249e3c459baa33062..9a4e4c7398d9631b695c620df39fbd08383ed77e 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup gamelogic
  */
 
-#ifndef __KX_ORCONTROLLER
-#define __KX_ORCONTROLLER
+#ifndef __SCA_ORCONTROLLER_H__
+#define __SCA_ORCONTROLLER_H__
 
 #include "SCA_IController.h"
 
@@ -46,5 +46,5 @@ public:
        virtual void Trigger(SCA_LogicManager* logicmgr);
 };
 
-#endif //__KX_ORCONTROLLER
+#endif //__SCA_ORCONTROLLER_H__
 
index 17419e34c2a705144ba39a8aa506e5cda1e9fd86..e465098131e1830f525a1f16cc6fdbb49f428b69 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup gamelogic
  */
 
-#ifndef __KX_PROPERTYACTUATOR
-#define __KX_PROPERTYACTUATOR
+#ifndef __SCA_PROPERTYACTUATOR_H__
+#define __SCA_PROPERTYACTUATOR_H__
 
 #include "SCA_IActuator.h"
 
index 3e8a947410b55807ea1500462b654e96559b1e42..7d5e13f0ae1664fadb487b3f2a32dbb545b41969 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup gamelogic
  */
 
-#ifndef __KX_PROPERTYEVENTMANAGER
-#define __KX_PROPERTYEVENTMANAGER
+#ifndef __SCA_PROPERTYEVENTMANAGER_H__
+#define __SCA_PROPERTYEVENTMANAGER_H__
 
 #include "SCA_EventManager.h"
 
@@ -54,5 +54,5 @@ public:
 #endif
 };
 
-#endif //__KX_PROPERTYEVENTMANAGER
+#endif //__SCA_PROPERTYEVENTMANAGER_H__
 
index bf7b1e879f712c79e54bc07e103816aa1a9e2370..ca942076efaceafb0391bf26f7e78ee70c3e46b8 100644 (file)
@@ -30,8 +30,8 @@
  *  \brief Property sensor
  */
 
-#ifndef __KX_PROPERTYSENSOR
-#define __KX_PROPERTYSENSOR
+#ifndef __SCA_PROPERTYSENSOR_H__
+#define __SCA_PROPERTYSENSOR_H__
 
 #include "SCA_ISensor.h"
 
index 521a676bf4a86238c4cdf421653fe2f6a5933275..ccdb82aa722650a37d8cd453d168a5ff6549d96d 100644 (file)
@@ -30,8 +30,8 @@
  *  \brief Execute Python scripts
  */
 
-#ifndef KX_PYTHONCONTROLLER_H
-#define KX_PYTHONCONTROLLER_H
+#ifndef __SCA_PYTHONCONTROLLER_H__
+#define __SCA_PYTHONCONTROLLER_H__
 
 #include "SCA_IController.h"
 #include "SCA_LogicManager.h"
@@ -115,5 +115,5 @@ class SCA_PythonController : public SCA_IController
 #endif
 };
 
-#endif //KX_PYTHONCONTROLLER_H
+#endif //__SCA_PYTHONCONTROLLER_H__
 
index f44bb40e13c6ccd5893fedbbf6a222bb964c1049..df5e46f8c286b2d37d4e59c79d88a728d700955a 100644 (file)
@@ -24,8 +24,8 @@
  *  \ingroup gamelogic
  */
 
-#ifndef __KX_PYKEYBOARD
-#define __KX_PYKEYBOARD
+#ifndef __SCA_PYTHONKEYBOARD_H__
+#define __SCA_PYTHONKEYBOARD_H__
 
 #include "PyObjectPlus.h"
 
@@ -47,5 +47,5 @@ public:
 #endif
 };
 
-#endif //__KX_PYKEYBOARD
+#endif //__SCA_PYTHONKEYBOARD_H__
 
index 41d286a8048bd15fd194825dc334b62aaac2a99a..1313d55005fbf2077cdb74bafc1d6487920e9681 100644 (file)
@@ -24,8 +24,8 @@
  *  \ingroup gamelogic
  */
 
-#ifndef __KX_PYMOUSE
-#define __KX_PYMOUSE
+#ifndef __SCA_PYTHONMOUSE_H__
+#define __SCA_PYTHONMOUSE_H__
 
 #include "PyObjectPlus.h"
 
@@ -56,5 +56,5 @@ public:
 #endif
 };
 
-#endif //__KX_PYMOUSE
+#endif //__SCA_PYTHONMOUSE_H__
 
index c439b445a5bae1e749bd8fd1505d22b54b92dacd..522663651e084de1ef20b3120a5d3456a1e4175d 100644 (file)
@@ -30,8 +30,8 @@
  *  \brief Draw a random number, and put it in a property
  */
 
-#ifndef __KX_RANDOMACTUATOR
-#define __KX_RANDOMACTUATOR
+#ifndef __SCA_RANDOMACTUATOR_H__
+#define __SCA_RANDOMACTUATOR_H__
 
 #include "SCA_IActuator.h"
 #include "SCA_RandomNumberGenerator.h"
index 31e087766036fa9cea57af3b909e2771071ced49..7205363a3eec0e1542b453581a598eafd81c15fd 100644 (file)
@@ -30,8 +30,8 @@
  *  \brief Manager for random events
  */
 
-#ifndef __KX_RANDOMEVENTMGR
-#define __KX_RANDOMEVENTMGR
+#ifndef __SCA_RANDOMEVENTMANAGER_H__
+#define __SCA_RANDOMEVENTMANAGER_H__
 
 #include "SCA_EventManager.h"
 #include <vector>
@@ -53,5 +53,5 @@ public:
 #endif
 };
 
-#endif //__KX_RANDOMEVENTMGR
+#endif //__SCA_RANDOMEVENTMANAGER_H__
 
index 87461b1a7839ec9dbe2540fd981192c2972a1896..a935db9402083153b021a412af3a23efd8f9cfd8 100644 (file)
@@ -32,8 +32,8 @@
  * on a per-generator basis.
  */
 
-#ifndef __KX_RANDOMNUMBERGENERATOR
-#define __KX_RANDOMNUMBERGENERATOR
+#ifndef __SCA_RANDOMNUMBERGENERATOR_H__
+#define __SCA_RANDOMNUMBERGENERATOR_H__
 
 #ifdef WITH_CXX_GUARDEDALLOC
 #include "MEM_guardedalloc.h"
@@ -83,5 +83,5 @@ public:
 #endif
 };
 
-#endif /* __KX_RANDOMNUMBERGENERATOR */
+#endif /* __SCA_RANDOMNUMBERGENERATOR_H__ */
 
index cec8bcdb445a816ccf1b55bc3af5ff02cea16184..008445ef87846a965b0b7ec037d25cb1a726b983 100644 (file)
@@ -30,8 +30,8 @@
  *  \brief Generate random pulses
  */
 
-#ifndef __KX_RANDOMSENSOR
-#define __KX_RANDOMSENSOR
+#ifndef __SCA_RANDOMSENSOR_H__
+#define __SCA_RANDOMSENSOR_H__
 
 #include "SCA_ISensor.h"
 #include "BoolValue.h"
@@ -68,5 +68,5 @@ public:
 #endif
 };
 
-#endif //__KX_RANDOMSENSOR
+#endif //__SCA_RANDOMSENSOR_H__
 
index cac52fb2de567ee7e8740fe80c43f4b2fcca1d2a..7c813785b9cb7a3858ef96203cf48392d2bfba53 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup gamelogic
  */
 
-#ifndef __KX_TIMEEVENTMANAGER
-#define __KX_TIMEEVENTMANAGER
+#ifndef __SCA_TIMEEVENTMANAGER_H__
+#define __SCA_TIMEEVENTMANAGER_H__
 
 #include "SCA_EventManager.h"
 #include "Value.h"
@@ -61,5 +61,5 @@ public:
 #endif
 };
 
-#endif //__KX_TIMEEVENTMANAGER
+#endif //__SCA_TIMEEVENTMANAGER_H__
 
index c2cdad2cdf46b92544de52a9d9a93044bcc2bd9f..5ef4dc67cf28bf2811ace3bc0ec7e1f511c824c1 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup gamelogic
  */
 
-#ifndef __KX_XNORCONTROLLER
-#define __KX_XNORCONTROLLER
+#ifndef __SCA_XNORCONTROLLER_H__
+#define __SCA_XNORCONTROLLER_H__
 
 #include "SCA_IController.h"
 
@@ -50,5 +50,5 @@ public:
 
 };
 
-#endif //__KX_XNORCONTROLLER
+#endif //__SCA_XNORCONTROLLER_H__
 
index 1f38a510046d54ea7c32f7b2e8140843c5bb5c8e..56cd2440863efb55b5866a216e5cb21154390833 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup gamelogic
  */
 
-#ifndef __KX_XORCONTROLLER
-#define __KX_XORCONTROLLER
+#ifndef __SCA_XORCONTROLLER_H__
+#define __SCA_XORCONTROLLER_H__
 
 #include "SCA_IController.h"
 
@@ -45,5 +45,5 @@ public:
        virtual void Trigger(SCA_LogicManager* logicmgr);
 };
 
-#endif //__KX_XORCONTROLLER
+#endif //__SCA_XORCONTROLLER_H__
 
index a9d7ab1b93f31b080fc9f4d08d89b08b2b3cf459..e865c662eda7c8508a81900b65192df44e970ac4 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup player
  */
 
-#ifndef _GPC_CANVAS_H_
-#define _GPC_CANVAS_H_
+#ifndef __GPC_CANVAS_H__
+#define __GPC_CANVAS_H__
 
 #include "RAS_ICanvas.h"
 #include "RAS_Rect.h"
@@ -270,5 +270,5 @@ protected:
        static TBannerId s_bannerId;
 };
 
-#endif // _GPC_CANVAS_H_
+#endif // __GPC_CANVAS_H__
 
index 70e5a3ee6316d4b35e024f4a9d7ea0ffffcc6ffa..095efee78951722bfe214a860e92e615d848f0dd 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup player
  */
 
-#ifndef __GPC_ENGINE_H
-#define __GPC_ENGINE_H
+#ifndef __GPC_ENGINE_H__
+#define __GPC_ENGINE_H__
 
 #include "GPC_Canvas.h"
 #include "GPC_System.h"
@@ -121,5 +121,5 @@ private:
 
 };
 
-#endif  // __GPC_ENGINE_H
+#endif  // __GPC_ENGINE_H__
 
index 3d88dc467b066791aa5d99b988b695ebd92276c1..ba4213b190c587bf5deeb425c0d034f817f08400 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup player
  */
 
-#ifndef __GPC_KEYBOARDDEVICE_H
-#define __GPC_KEYBOARDDEVICE_H
+#ifndef __GPC_KEYBOARDDEVICE_H__
+#define __GPC_KEYBOARDDEVICE_H__
 
 #ifdef WIN32
 #pragma warning (disable : 4786)
index a4f0032df1d7faa818ea52b330939110cf051e35..c5576d1d2344d702cc6a346139739164fe5009ff 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup player
  */
 
-#ifndef __GPC_MOUSE_DEVICE_H
-#define __GPC_MOUSE_DEVICE_H
+#ifndef __GPC_MOUSEDEVICE_H__
+#define __GPC_MOUSEDEVICE_H__
 
 #ifdef WIN32
 #pragma warning (disable : 4786)
@@ -102,5 +102,5 @@ protected:
        virtual bool ConvertEvent(KX_EnumInputs kxevent, int eventval);
 };
 
-#endif  // __GPC_MOUSE_DEVICE_H
+#endif  // __GPC_MOUSEDEVICE_H__
 
index 9b27ba3f0098d4e1315f6727ba4f07e298751da4..6f15276ab835aa121671c537511f2e59e151995b 100644 (file)
  *  \ingroup player
  */
 
-#ifndef __GPC_RAWLOADDOTBLENDARRAY_H
-#define __GPC_RAWLOADDOTBLENDARRAY_H
+#ifndef __GPC_RAWLOADDOTBLENDARRAY_H__
+#define __GPC_RAWLOADDOTBLENDARRAY_H__
 
 void GetRawLoadingAnimation(unsigned char **data, int *dataSize);
 
-#endif  // __GPC_RAWLOADDOTBLENDARRAY_H
+#endif  // __GPC_RAWLOADDOTBLENDARRAY_H__
 
index 43bd6d2219026fd89ab6d96dde8a98046a450fd5..ade000203534b10483608bc6a084c7aa70f34129 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup player
  */
 
-#ifndef __GPC_RAWLOGOARRAYS_H
-#define __GPC_RAWLOGOARRAYS_H
+#ifndef __GPC_RAWLOGOARRAYS_H__
+#define __GPC_RAWLOGOARRAYS_H__
 
 void GetRawBlenderLogo(unsigned char **data, int *width, int *height);
 void GetRawBlender3DLogo(unsigned char **data, int *width, int *height);
@@ -38,5 +38,5 @@ void GetRawBlender3DLogo(unsigned char **data, int *width, int *height);
 void GetRawNaNLogo(unsigned char **data, int *width, int *height);
 #endif
 
-#endif  // __GPC_RAWLOGOARRAYS_H
+#endif  // __GPC_RAWLOGOARRAYS_H__
 
index e3c6902970058357a551b0976891fb71c2378db5..54bf45fc74b7c93bff23041aa6cf89c1570021fd 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup player
  */
 
-#ifndef __GPC_RENDERTOOLS_H
-#define __GPC_RENDERTOOLS_H
+#ifndef __GPC_RENDERTOOLS_H__
+#define __GPC_RENDERTOOLS_H__
 
 #ifdef WIN32
 // don't show stl-warnings
@@ -106,7 +106,7 @@ public:
        virtual void SetClientObject(RAS_IRasterizer *rasty, void* obj);
 };
 
-#endif  // __GPC_RENDERTOOLS_H
+#endif  // __GPC_RENDERTOOLS_H__
 
 
 
index 9f7a56aa783f9d09239285cf3c1a3e4c1d165196..03bb774363771d05191c7dcae0d27b1ff28e30b8 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup player
  */
 
-#ifndef __GPC_SYSTEM_H
-#define __GPC_SYSTEM_H
+#ifndef __GPC_SYSTEM_H__
+#define __GPC_SYSTEM_H__
 
 #if defined(WIN32)
 #pragma warning (disable:4786) // suppress stl-MSVC debug info warning
@@ -59,5 +59,5 @@ public:
 //     NG_NetworkDeviceInterface* m_ndi;
 };
 
-#endif  // __GPC_SYSTEM_H
+#endif  // __GPC_SYSTEM_H__
 
index 217cfc5eb88278f9d1f93344791c482373a93fe1..e96cd50b9f4c74e16bf019f44ee889ea03b10cb2 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup player
  */
 
-#ifndef _GPG_CANVAS_H_
-#define _GPG_CANVAS_H_
+#ifndef __GPG_CANVAS_H__
+#define __GPG_CANVAS_H__
 
 #ifdef WIN32
 #pragma warning (disable : 4786)
@@ -66,5 +66,5 @@ public:
        void EndDraw() {};
 };
 
-#endif // _GPG_CANVAS_H_
+#endif // __GPG_CANVAS_H__
 
index 2c7ba86e438fcfa1034605ddfbda103a2324eaf7..57fd0694ec05aab378197ac0006634a554704ef8 100644 (file)
@@ -30,8 +30,8 @@
  *  \brief GHOST Blender Player keyboard device.
  */
 
-#ifndef _GPG_KEYBOARDDEVICE_H_
-#define _GPG_KEYBOARDDEVICE_H_
+#ifndef __GPG_KEYBOARDDEVICE_H__
+#define __GPG_KEYBOARDDEVICE_H__
 
 #ifdef WIN32
 #pragma warning (disable : 4786)
@@ -53,5 +53,5 @@ public:
        virtual ~GPG_KeyboardDevice(void);
 };
 
-#endif //_GPG_KEYBOARDDEVICE_H_
+#endif //__GPG_KEYBOARDDEVICE_H__
 
index d7f3093d8b03996d3bc32f2bbee550366d2274f9..796ad0c2b8cebaa2478d7715790febd5fc88ffed 100644 (file)
@@ -30,8 +30,8 @@
  *  \brief Blender Player system on GHOST.
  */
 
-#ifndef _GPG_SYSTEM_H_
-#define _GPG_SYSTEM_H_
+#ifndef __GPG_SYSTEM_H__
+#define __GPG_SYSTEM_H__
 
 #ifdef WIN32
 #pragma warning (disable:4786) // suppress stl-MSVC debug info warning
@@ -51,5 +51,5 @@ public:
        virtual double GetTimeInSeconds();
 };
 
-#endif // _GPG_SYSTEM_H_
+#endif // __GPG_SYSTEM_H__
 
index 3efea0576fd2e98a1fdd0594e22bd616c279c2a1..e5e325a2ba023a5b049be89edffc328d515bf2da 100644 (file)
@@ -24,8 +24,8 @@
  *  \ingroup ketsji
  */
 
-#ifndef __BL_ACTION
-#define __BL_ACTION
+#ifndef __BL_ACTION_H__
+#define __BL_ACTION_H__
 
 
 #include <vector>
index 2ba84863f9583e62c16f157dc394c10c0b31cb72..d4351e3c70488b1612fd5ab3abdd8b9f29e93b30 100644 (file)
@@ -24,8 +24,8 @@
  *  \ingroup ketsji
  */
 
-#ifndef __BL_ACTIONMANAGER
-#define __BL_ACTIONMANAGER
+#ifndef __BL_ACTIONMANAGER_H__
+#define __BL_ACTIONMANAGER_H__
 
 #include "BL_Action.h"
 
index 1331899a6b2db57d508ed1fa32a55011233cf58a..d309b1236fcb3a29f4adcec9f80e24965dd72d0d 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup ketsji
  */
 
-#ifndef __BL_GPUSHADER_H__
-#define __BL_GPUSHADER_H__
+#ifndef __BL_BLENDERSHADER_H__
+#define __BL_BLENDERSHADER_H__
 
 #include "GPU_material.h"
 
@@ -103,4 +103,4 @@ public:
 #endif
 };
 
-#endif//__BL_GPUSHADER_H__
+#endif//__BL_BLENDERSHADER_H__
index d14d3600b4857bb343fbe94831830c8afcb217c3..4f560428fbb85532a30ab42ae636c01c1935bd4f 100644 (file)
@@ -30,8 +30,8 @@
  *  \brief Ketsji Logic Extenstion: Network Event Manager class
  */
 
-#ifndef KX_NETWORK_EVENTMANAGER_H
-#define KX_NETWORK_EVENTMANAGER_H
+#ifndef __KX_NETWORKEVENTMANAGER_H__
+#define __KX_NETWORKEVENTMANAGER_H__
 
 #include "SCA_EventManager.h"
 
@@ -52,5 +52,5 @@ public:
                return m_ndi; }
 };
 
-#endif //KX_NETWORK_EVENTMANAGER_H
+#endif //__KX_NETWORKEVENTMANAGER_H__
 
index f344735605504a50259e0e0db1c512c4f2006f89..3c8d8ec23d2bcc95982c03748b1eef597116af39 100644 (file)
@@ -30,8 +30,8 @@
  *  \brief Ketsji Logic Extenstion: Network Message Actuator class
  */
 
-#ifndef __KX_NETWORKMESSAGEACTUATOR_H
-#define __KX_NETWORKMESSAGEACTUATOR_H
+#ifndef __KX_NETWORKMESSAGEACTUATOR_H__
+#define __KX_NETWORKMESSAGEACTUATOR_H__
 
 #include "STR_String.h"
 #include "SCA_IActuator.h"
@@ -69,5 +69,5 @@ public:
 
 };
 
-#endif //__KX_NETWORKMESSAGEACTUATOR_H
+#endif //__KX_NETWORKMESSAGEACTUATOR_H__
 
index 75800d9b9fa32cb75b5d04904767a6500cb377e1..0c76e718fa2fe9b0d58c51e6e416760de1ff46bb 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup ketsjinet
  *  \brief Ketsji Logic Extenstion: Network Message Sensor class
  */
-#ifndef __KX_NETWORKMESSAGE_SENSOR_H
-#define __KX_NETWORKMESSAGE_SENSOR_H
+#ifndef __KX_NETWORKMESSAGESENSOR_H__
+#define __KX_NETWORKMESSAGESENSOR_H__
 
 #include "SCA_ISensor.h"
 
@@ -87,5 +87,5 @@ public:
 
 };
 
-#endif //__KX_NETWORKMESSAGE_SENSOR_H
+#endif //__KX_NETWORKMESSAGESENSOR_H__
 
index 683a54f65de29f52dda81e2519ce39a3de9eaebf..9c3faa355a65bb64e760890c9e5172783fc04116 100644 (file)
@@ -30,8 +30,8 @@
  *  \brief Property sensor
  */
 
-#ifndef __KX_ARMATURESENSOR
-#define __KX_ARMATURESENSOR
+#ifndef __KX_ARMATURESENSOR_H__
+#define __KX_ARMATURESENSOR_H__
 
 struct bConstraint;
 
index 18f9875a804afbd1523074f98060df4603bc283a..af6771933eb79a8c1bfa0f136a6c2811e64f89e9 100644 (file)
@@ -3,8 +3,8 @@
  *  \ingroup ketsji
  */
 
-#ifndef __KX_BLENDER_MATERIAL_H__
-#define __KX_BLENDER_MATERIAL_H__
+#ifndef __KX_BLENDERMATERIAL_H__
+#define __KX_BLENDERMATERIAL_H__
 
 #include <vector>
 
index c0ff143919d2bcc43aa59d1ce3a5b3661c7473a7..d2f56bccaa0106b83e429ff67be1294b9517d283 100644 (file)
@@ -3,8 +3,8 @@
  *  \ingroup ketsji
  */
 
-#ifndef KX_BULLET2PHYSICS_CONTROLLER
-#define KX_BULLET2PHYSICS_CONTROLLER
+#ifndef __KX_BULLETPHYSICSCONTROLLER_H__
+#define __KX_BULLETPHYSICSCONTROLLER_H__
 
 
 #include "KX_IPhysicsController.h"
@@ -98,5 +98,5 @@ public:
 #endif
 };
 
-#endif //KX_BULLET2PHYSICS_CONTROLLER
+#endif //__KX_BULLETPHYSICSCONTROLLER_H__
 
index e9c4e99aa3b025f938790d37d0ab9566077e8ef3..2f5fe112de64ba7aaa5b4bb8f186c403894bb862 100644 (file)
@@ -30,8 +30,8 @@
  *  \brief Camera in the gameengine. Cameras are also used for views.
  */
 
-#ifndef __KX_CAMERA
-#define __KX_CAMERA
+#ifndef __KX_CAMERA_H__
+#define __KX_CAMERA_H__
 
 
 #include "MT_Transform.h"
@@ -320,5 +320,5 @@ public:
 #endif
 };
 
-#endif //__KX_CAMERA
+#endif //__KX_CAMERA_H__
 
index 1cae676fe3ff280f84d8911834c333534b49994e..eb0a4574a8fa97de8bcb94d4a6bdbeb814bdf0b4 100644 (file)
@@ -32,8 +32,8 @@
  *  \ingroup ketsji
  */
 
-#ifndef __KX_CAMERAACTUATOR
-#define __KX_CAMERAACTUATOR
+#ifndef __KX_CAMERAACTUATOR_H__
+#define __KX_CAMERAACTUATOR_H__
 
 #include "SCA_IActuator.h"
 #include "MT_Scalar.h"
@@ -135,5 +135,5 @@ private :
 
 };
 
-#endif //__KX_CAMERAACTUATOR
+#endif //__KX_CAMERAACTUATOR_H__
 
index fb91455fed497d04420f069fff3ee65920b593d9..f24d094229053148999da9483c5143c986d0f81b 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup ketsji
  */
 
-#ifndef KX_CAMERAIPOSGCONTROLLER_H
-#define KX_CAMERAIPOSGCONTROLLER_H
+#ifndef __KX_CAMERAIPOSGCONTROLLER_H__
+#define __KX_CAMERAIPOSGCONTROLLER_H__
 
 #include "SG_Controller.h"
 #include "SG_Spatial.h"
@@ -96,5 +96,5 @@ public:
 #endif
 };
 
-#endif // KX_CAMERAIPOSGCONTROLLER_H
+#endif // __KX_CAMERAIPOSGCONTROLLER_H__
 
index 78f2f5446d465ea43ef11993dcc9eb0d560a6090..1a94c39441fc19608e6f0161e23f65db50aa6589 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup ketsji
  */
 
-#ifndef __KX_CLIENTOBJECT_INFO_H
-#define __KX_CLIENTOBJECT_INFO_H
+#ifndef __KX_CLIENTOBJECTINFO_H__
+#define __KX_CLIENTOBJECTINFO_H__
 
 /* Note, the way this works with/without sumo is a bit odd */
 
@@ -86,5 +86,5 @@ public:
 #endif
 };
 
-#endif //__KX_CLIENTOBJECT_INFO_H
+#endif //__KX_CLIENTOBJECTINFO_H__
 
index b513b141f3e4da666d542f9c705cc6eaab3bc5d6..f491aedba74af97c403a98534a47dd9f190f38a7 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup ketsji
  */
 
-#ifndef __KX_CONSTRAINTACTUATOR
-#define __KX_CONSTRAINTACTUATOR
+#ifndef __KX_CONSTRAINTACTUATOR_H__
+#define __KX_CONSTRAINTACTUATOR_H__
 
 #include "SCA_IActuator.h"
 #include "MT_Scalar.h"
@@ -145,5 +145,5 @@ protected:
 
 };
 
-#endif //__KX_CONSTRAINTACTUATOR
+#endif //__KX_CONSTRAINTACTUATOR_H__
 
index 980221bd4b35736ff9cae13032a0c26367563015..bd27bc5b3332aee614b9bf579f5b3b039be40916 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup ketsji
  */
 
-#ifndef KX_CONSTRAINT_WRAPPER
-#define KX_CONSTRAINT_WRAPPER
+#ifndef __KX_CONSTRAINTWRAPPER_H__
+#define __KX_CONSTRAINTWRAPPER_H__
 
 #include "Value.h"
 #include "PHY_DynamicTypes.h"
@@ -57,5 +57,5 @@ private:
        PHY_IPhysicsEnvironment* m_physenv;
 };
 
-#endif //KX_CONSTRAINT_WRAPPER
+#endif //__KX_CONSTRAINTWRAPPER_H__
 
index 9471d58badaccdc7ed85c3c652153bbe178c53e4..f1f58d7da9ac55607a3df586920eeb85f9ba5653 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup ketsji
  */
 
-#ifndef KX_CONVERTPHYSICSOBJECTS
-#define KX_CONVERTPHYSICSOBJECTS
+#ifndef __KX_CONVERTPHYSICSOBJECT_H__
+#define __KX_CONVERTPHYSICSOBJECT_H__
 
 class RAS_MeshObject;
 class KX_Scene;
@@ -158,4 +158,4 @@ void        KX_ClearBulletSharedShapes();
 bool KX_ReInstanceBulletShapeFromMesh(KX_GameObject *gameobj, KX_GameObject *from_gameobj, RAS_MeshObject* from_meshobj);
 
 #endif
-#endif //KX_CONVERTPHYSICSOBJECTS
+#endif //__KX_CONVERTPHYSICSOBJECT_H__
index 845a37fa04a2def5d428883efae83c2b0e4e4766..7ad9984888d910362d701a84015e35ae771fefc9 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup ketsji
  */
 
-#ifndef __KX_EMPTYOBJECT
-#define  __KX_EMPTYOBJECT
+#ifndef __KX_EMPTYOBJECT_H__
+#define  __KX_EMPTYOBJECT_H__
 #include "KX_GameObject.h"
 
 class KX_EmptyObject : public KX_GameObject
@@ -49,5 +49,5 @@ public:
 #endif
 };
 
-#endif //__KX_EMPTYOBJECT
+#endif //__KX_EMPTYOBJECT_H__
 
index 958a6cd3360629df642329d2d54da5ed4c1f0e78..2466a32dad42db9ff1977ece9a4b618310d8f478 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup ketsji
  */
 
-#ifndef __KX_FONTOBJECT
-#define  __KX_FONTOBJECT
+#ifndef __KX_FONTOBJECT_H__
+#define  __KX_FONTOBJECT_H__
 #include "KX_GameObject.h"
 #include "DNA_vfont_types.h"
 #include "RAS_IRenderTools.h"
@@ -84,4 +84,4 @@ public:
 
 };
 
-#endif //__KX_FONTOBJECT
+#endif //__KX_FONTOBJECT_H__
index ebc6712a2ddf802cf927caae9d0d15402f31784b..8356bc1068bd5d1fbc38a4c2c8375037c9c1e3e7 100644 (file)
@@ -30,8 +30,8 @@
  *  \brief actuator for global game stuff
  */
 
-#ifndef __KX_GAMEACTUATOR
-#define __KX_GAMEACTUATOR
+#ifndef __KX_GAMEACTUATOR_H__
+#define __KX_GAMEACTUATOR_H__
 
 #include "SCA_IActuator.h"
 
index a35e6f1b2cd0d571db49a4d3469d8fae5e7a2038..895140528e83df0ae247edba05c36770a0ac5f58 100644 (file)
@@ -30,8 +30,8 @@
  *  \brief General KX game object.
  */
 
-#ifndef __KX_GAMEOBJECT
-#define __KX_GAMEOBJECT
+#ifndef __KX_GAMEOBJECT_H__
+#define __KX_GAMEOBJECT_H__
 
 #if defined(WIN32) && !defined(FREE_WINDOWS)
 // get rid of this stupid "warning 'this' used in initialiser list", generated by VC when including Solid/Sumo
@@ -1008,5 +1008,5 @@ public:
 
 
 
-#endif //__KX_GAMEOBJECT
+#endif //__KX_GAMEOBJECT_H__
 
index ed843962bd08a116e504cf21eb367f2c9c5dc4db..2e30d77f8e529476474ed01f3fdf913b3a162070 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup ketsji
  */
 
-#ifndef KX_IINTERPOLATOR_H
-#define KX_IINTERPOLATOR_H
+#ifndef __KX_IINTERPOLATOR_H__
+#define __KX_IINTERPOLATOR_H__
 
 #include <vector>
 
index c028b4c49d236f1bf4a94bc2f1429345295a30b4..43019f3e54a7cfaed45df3dfcecae88d043edc92 100644 (file)
@@ -30,8 +30,8 @@
  *  \brief An abstract object you can move around in a 3d world, and has some logic
  */
 
-#ifndef KX_IPOTRANSFORM_H
-#define KX_IPOTRANSFORM_H
+#ifndef __KX_IPOTRANSFORM_H__
+#define __KX_IPOTRANSFORM_H__
 
 #include "MT_Transform.h"
 
index f7e57014839ebe230ac7630d38800d42a916384d..3abcaa3a39ea15386b22ea2f0726a6304e10d5b0 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup ketsji
  */
 
-#ifndef __IPO_SGCONTROLLER_H
-#define __IPO_SGCONTROLLER_H
+#ifndef __KX_IPO_SGCONTROLLER_H__
+#define __KX_IPO_SGCONTROLLER_H__
 
 #include "SG_Controller.h"
 #include "SG_Spatial.h"
@@ -127,6 +127,6 @@ public:
 #endif
 };
 
-#endif //__IPO_SGCONTROLLER_H
+#endif //__KX_IPO_SGCONTROLLER_H__
 
 
index 2d08ef3a0da7aadf88bf8a3192b1d759a3ceed9a..5fc9f5c2473dd5acde7396fb7f4010c202f75fbc 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup ketsji
  */
 
-#ifndef __KX_IPHYSICSCONTROLLER_H
-#define __KX_IPHYSICSCONTROLLER_H
+#ifndef __KX_IPHYSICSCONTROLLER_H__
+#define __KX_IPHYSICSCONTROLLER_H__
 
 #include "SG_Controller.h"
 #include "MT_Vector3.h"
@@ -138,5 +138,5 @@ public:
 #endif
 };
 
-#endif //__KX_IPHYSICSCONTROLLER_H
+#endif //__KX_IPHYSICSCONTROLLER_H__
 
index 0ac765abb4ff1c78036b99999440af27cd30cb44..72842f311c914c36cef573ebbc5bce8096139631 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup ketsji
  */
 
-#ifndef KX_ISCALARINTERPOLATOR_H
-#define KX_ISCALARINTERPOLATOR_H
+#ifndef __KX_ISCALARINTERPOLATOR_H__
+#define __KX_ISCALARINTERPOLATOR_H__
 
 #ifdef WITH_CXX_GUARDEDALLOC
 #include "MEM_guardedalloc.h"
index 5afdaa971bc6decff9d1a1979787a396b8251890..dce97ea039fd69ba7a2b68284963e8c4bd1d7c6e 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup ketsji
  */
 
-#ifndef __KX_ISCENECONVERTER_H
-#define __KX_ISCENECONVERTER_H
+#ifndef __KX_ISCENECONVERTER_H__
+#define __KX_ISCENECONVERTER_H__
 
 #include "STR_String.h"
 #include "KX_Python.h"
@@ -95,5 +95,5 @@ public:
 #endif
 };
 
-#endif //__KX_ISCENECONVERTER_H
+#endif //__KX_ISCENECONVERTER_H__
 
index d0a51490e28a364e04c92183e3b1ae19d0e95412..4a6f7223d0a97b76c0c9f512bc5b4954a2ff85b9 100644 (file)
@@ -30,8 +30,8 @@
  *  \brief Abstract system
  */
 
-#ifndef __KX_ISYSTEM
-#define __KX_ISYSTEM
+#ifndef __KX_ISYSTEM_H__
+#define __KX_ISYSTEM_H__
 
 #include <vector>
 using namespace std;
index 6b172ba8603d2b0b1e2403e1020cf2934864cf3e..a8b7a362bd9dcb840b4ff8c47dff9d2cf1b69e29 100644 (file)
@@ -30,8 +30,8 @@
  *  \brief Do an object ipo
  */
 
-#ifndef __KX_IPOACTUATOR
-#define __KX_IPOACTUATOR
+#ifndef __KX_IPOACTUATOR_H__
+#define __KX_IPOACTUATOR_H__
 
 #include "SCA_IActuator.h"
 
@@ -150,5 +150,5 @@ public:
        
 };
 
-#endif //__KX_IPOACTUATOR
+#endif //__KX_IPOACTUATOR_H__
 
index 96b737b686df4b34a18e0af142fd001204d925f6..ab3126d90a052417bac506f78645b7f0d35a885c 100644 (file)
@@ -30,8 +30,8 @@
  *  \ingroup ketsji
  */
 
-#ifndef __KX_KETSJI_ENGINE
-#define __KX_KETSJI_ENGINE
+#ifndef __KX_KETSJIENGINE_H__
+#define __KX_KETSJIENGINE_H__
 
 #include "MT_CmMatrix4x4.h"
 #include "MT_Matrix4x4.h"
@@ -450,6 +450,6 @@ public:
 #endif
 };
 
-#endif //__KX_KETSJI_ENGINE
+#endif //__KX_KETSJIENGINE_H__
 
 
index bb081e6a44449ba411d7381b62ff4f3f6c780a15..c2815e7afaa5809d2babea964b673d4dafe23d8e 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup ketsji
  */
 
-#ifndef __KX_LIGHT
-#define __KX_LIGHT
+#ifndef __KX_LIGHT_H__
+#define __KX_LIGHT_H__
 
 #include "RAS_LightObject.h"
 #include "KX_GameObject.h"
@@ -82,5 +82,5 @@ public:
 #endif
 };
 
-#endif //__KX_LIGHT
+#endif //__KX_LIGHT_H__
 
index 61618c20183ccfd94fbb1ccd729d9610ed19dd57..78466e822e7d588c88c9bab9c95a11ec9e5b0228 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup ketsji
  */
 
-#ifndef KX_LIGHTIPOSGCONTROLLER_H
-#define KX_LIGHTIPOSGCONTROLLER_H
+#ifndef __KX_LIGHTIPOSGCONTROLLER_H__
+#define __KX_LIGHTIPOSGCONTROLLER_H__
 
 #include "SG_Controller.h"
 #include "SG_Spatial.h"
@@ -104,5 +104,5 @@ public:
 #endif
 };
 
-#endif // KX_LIGHTIPOSGCONTROLLER_H
+#endif // __KX_LIGHTIPOSGCONTROLLER_H__
 
index f59418a5de26cfea9af1fc8854f47fdc9d8115d5..dfaf1eba0091b9fd502043c992a71e8f81338de2 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup ketsji
  */
 
-#ifndef __KX_MESHPROXY
-#define __KX_MESHPROXY
+#ifndef __KX_MESHPROXY_H__
+#define __KX_MESHPROXY_H__
 
 #ifdef WITH_PYTHON
 
@@ -79,5 +79,5 @@ public:
 
 #endif // WITH_PYTHON
 
-#endif //__KX_MESHPROXY
+#endif //__KX_MESHPROXY_H__
 
index b18a745ad92855366892f8ea60add8491ca7e018..02470f88c5e8292542559d1b1295584326e2037b 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup ketsji
  */
 
-#ifndef __KX_MOTIONSTATE
-#define __KX_MOTIONSTATE
+#ifndef __KX_MOTIONSTATE_H__
+#define __KX_MOTIONSTATE_H__
 
 #include "PHY_IMotionState.h"
 
@@ -63,5 +63,5 @@ public:
 #endif
 };
 
-#endif //__KX_MOTIONSTATE
+#endif //__KX_MOTIONSTATE_H__
 
index 43bf6bc5302bcc4c3c0f857a8e990d65e892226c..a4c15fe0968f357a19d631d9abc7fb118d5b4aca 100644 (file)
@@ -30,8 +30,8 @@
  *  \brief KX_MouseFocusSensor determines mouse in/out/over events.
  */
 
-#ifndef __KX_MOUSEFOCUSSENSOR
-#define __KX_MOUSEFOCUSSENSOR
+#ifndef __KX_MOUSEFOCUSSENSOR_H__
+#define __KX_MOUSEFOCUSSENSOR_H__
 
 #include "SCA_MouseSensor.h"
 
index ad128a0891d31c9d919edaa018150f889d644811..b9c1fcc66dbaed6f90e303b768606284c5303b1d 100644 (file)
@@ -24,8 +24,8 @@
  *
  * ***** END GPL LICENSE BLOCK *****
  */
-#ifndef __KX_NAVMESHOBJECT
-#define __KX_NAVMESHOBJECT
+#ifndef __KX_NAVMESHOBJECT_H__
+#define __KX_NAVMESHOBJECT_H__
 #include "DetourStatNavMesh.h"
 #include "KX_GameObject.h"
 #include "PyObjectPlus.h"
@@ -77,5 +77,5 @@ public:
 #endif
 };
 
-#endif //__KX_NAVMESHOBJECT
+#endif //__KX_NAVMESHOBJECT_H__
 
index a81d621e8fcc54d90354c1531d9914b24ddceeac..ffe077b973842190effc0079a167ad8d57e529a7 100644 (file)
@@ -30,8 +30,8 @@
  *  \brief Sense if other objects are near
  */
 
-#ifndef KX_NEARSENSOR_H
-#define KX_NEARSENSOR_H
+#ifndef __KX_NEARSENSOR_H__
+#define __KX_NEARSENSOR_H__
 
 #include "KX_TouchSensor.h"
 #include "KX_ClientObjectInfo.h"
@@ -104,5 +104,5 @@ public:
 
 };
 
-#endif //KX_NEARSENSOR_H
+#endif //__KX_NEARSENSOR_H__
 
index 230ef93905b72b0cd1bde4e84146d4d27c1af78a..d2d69d6db12c75eeef85df9ba33faf0e072a04b3 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup ketsji
  */
 
-#ifndef KX_OBCOLORIPOSGCONTROLLER_H
-#define KX_OBCOLORIPOSGCONTROLLER_H
+#ifndef __KX_OBCOLORIPOSGCONTROLLER_H__
+#define __KX_OBCOLORIPOSGCONTROLLER_H__
 
 #include "SG_Controller.h"
 #include "SG_Spatial.h"
@@ -79,5 +79,5 @@ public:
 #endif
 };
 
-#endif // KX_OBCOLORIPOSGCONTROLLER_H
+#endif // __KX_OBCOLORIPOSGCONTROLLER_H__
 
index aa0f844eb88df3628f698ddd795ed06ce0b65c53..397234488b7a37b5c38b04d49d9bad5fc086452d 100644 (file)
@@ -30,8 +30,8 @@
  *  \brief Do translation/rotation actions
  */
 
-#ifndef __KX_OBJECTACTUATOR
-#define __KX_OBJECTACTUATOR
+#ifndef __KX_OBJECTACTUATOR_H__
+#define __KX_OBJECTACTUATOR_H__
 
 #include "SCA_IActuator.h"
 #include "MT_Vector3.h"
@@ -222,5 +222,5 @@ public:
 
 };
 
-#endif //__KX_OBJECTACTUATOR
+#endif //__KX_OBJECTACTUATOR_H__
 
index f429d7480c922c1bc443a674c9616be6fc95ec2c..d9bda34f1128ccb552c77e3cc3de11070faa2ebf 100644 (file)
@@ -23,8 +23,8 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-#ifndef __KX_OBSTACLESIMULATION
-#define __KX_OBSTACLESIMULATION
+#ifndef __KX_OBSTACLESIMULATION_H__
+#define __KX_OBSTACLESIMULATION_H__
 
 #include <vector>
 #include "MT_Point2.h"
index c9aacbafae27f8b574d5935e34e4a861dc83db6f..1a4ed534d169d5185451717fcaf9199a9929bb54 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup ketsji
  */
 
-#ifndef KX_ORIENTATIONINTERPOLATOR
-#define KX_ORIENTATIONINTERPOLATOR
+#ifndef __KX_ORIENTATIONINTERPOLATOR_H__
+#define __KX_ORIENTATIONINTERPOLATOR_H__
 
 #include "KX_IInterpolator.h"
 
index d950989474856b269c92517c097990911c10231f..6191b889da398a547f2c21d2442e5b5a1cb74a8b 100644 (file)
@@ -30,8 +30,8 @@
  *  \brief Set or remove an objects parent
  */
 
-#ifndef __KX_PARENTACTUATOR
-#define __KX_PARENTACTUATOR
+#ifndef __KX_PARENTACTUATOR_H__
+#define __KX_PARENTACTUATOR_H__
 
 #include "SCA_IActuator.h"
 #include "SCA_LogicManager.h"
index 11474c678af3e178d82c31ea11c022c4cc78169e..f20bab578d1bb7871771d3d64c48b3a3d089efcd 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup ketsji
  */
 
-#ifndef __KX_PHYSICSENGINEENUMS
-#define __KX_PHYSICSENGINEENUMS
+#ifndef __KX_PHYSICSENGINEENUMS_H__
+#define __KX_PHYSICSENGINEENUMS_H__
 
 enum   e_PhysicsEngine
 {
@@ -43,5 +43,5 @@ enum  e_PhysicsEngine
                UseBullet       =       5,
 };
 
-#endif //__KX_PHYSICSENGINEENUMS
+#endif //__KX_PHYSICSENGINEENUMS_H__
 
index 4f03c8fbfb1a5a20f68b12ed0811e8d65c5109bd..a074ff9a3bd299d88f084c833566bdc8474cee74 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup ketsji
  */
 
-#ifndef PHYP_PHYSICSOBJECT_WRAPPER
-#define PHYP_PHYSICSOBJECT_WRAPPER
+#ifndef __KX_PHYSICSOBJECTWRAPPER_H__
+#define __KX_PHYSICSOBJECTWRAPPER_H__
 
 #include "Value.h"
 #include "PHY_DynamicTypes.h"
@@ -56,5 +56,5 @@ private:
        PHY_IPhysicsEnvironment* m_physenv;
 };
 
-#endif //PHYP_PHYSICSOBJECT_WRAPPER
+#endif //__KX_PHYSICSOBJECTWRAPPER_H__
 
index bb2fb08644c53d2273828ff5db9b081ad2695392..86ba2500763cc74d167bb807741dc862294032e6 100644 (file)
@@ -30,8 +30,8 @@
  *  \todo check if this file is still needed
  */
 
-#ifndef KX_PROPSH
-#define KX_PROPSH
+#ifndef __KX_PHYSICSPROPERTIESOBSOLETE_H__
+#define __KX_PHYSICSPROPERTIESOBSOLETE_H__
 
 #include <MT_Scalar.h>
 
@@ -58,5 +58,5 @@ struct KX_MaterialProps {
        bool      m_fh_normal;             // Should the object slide off slopes?
 };
 
-#endif //KX_PROPSH
+#endif //__KX_PHYSICSPROPERTIESOBSOLETE_H__
 
index 88124cfd085f1f8713aa6e818fa662cb209c4e0b..ef5dfc8ac6bd68299972330b9902a807c9c90c2f 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup ketsji
  */
 
-#ifndef KX_POSITIONINTERPOLATOR
-#define KX_POSITIONINTERPOLATOR
+#ifndef __KX_POSITIONINTERPOLATOR_H__
+#define __KX_POSITIONINTERPOLATOR_H__
 
 #include "KX_IInterpolator.h"
 
index a5846d91a5c89f5306749a005221519c7a206aba..2c98e6347da80938ff7b6dd785645996cb1baf68 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup ketsji
  */
 
-#ifndef PHY_PYTHON_CONSTRAINTBINDING
-#define PHY_PYTHON_CONSTRAINTBINDING
+#ifndef __KX_PYCONSTRAINTBINDING_H__
+#define __KX_PYCONSTRAINTBINDING_H__
 
 #ifdef WITH_PYTHON
 
@@ -42,5 +42,5 @@ void  PHY_SetActiveEnvironment(class  PHY_IPhysicsEnvironment* env);
 PHY_IPhysicsEnvironment*       PHY_GetActiveEnvironment();
 #endif // WITH_PYTHON
 
-#endif //PHY_PYTHON_CONSTRAINTBINDING
+#endif //__KX_PYCONSTRAINTBINDING_H__
 
index 40d2d38a46541de7c97b080c2894c72257937d6d..d8346018b55544bfffbc67dbd049450995af20a7 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup ketsji
  */
 
-#ifndef __KX_PYTHON_INIT
-#define __KX_PYTHON_INIT
+#ifndef __KX_PYTHONINIT_H__
+#define __KX_PYTHONINIT_H__
 
 #include "KX_Python.h"
 #include "STR_String.h"
@@ -74,5 +74,5 @@ void          KX_RasterizerDrawDebugCircle(const MT_Vector3& center, const MT_Scalar rad
                                                                                 const MT_Vector3& normal, int nsector);
 
 
-#endif //__KX_PYTHON_INIT
+#endif //__KX_PYTHONINIT_H__
 
index ee803d9bdb9e994709aaadd93ac3ecefe02b54ec..f647189ab35b969470477d1a4c08b6d99ddec767 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup ketsji
  */
 
-#ifndef __KX_RADAR_SENSOR_H
-#define __KX_RADAR_SENSOR_H
+#ifndef __KX_RADARSENSOR_H__
+#define __KX_RADARSENSOR_H__
 
 #include "KX_NearSensor.h"
 #include "MT_Point3.h"
@@ -95,5 +95,5 @@ public:
 
 };
 
-#endif //__KX_RADAR_SENSOR_H
+#endif //__KX_RADARSENSOR_H__
 
index 0b1e525eccf32d13b876c00f5d98320db59a1776..fee2fe53227c0a1c3cdaa6b0409119efccab8055 100644 (file)
@@ -30,8 +30,8 @@
  *  \brief Manager for ray events
  */
 
-#ifndef __KX_RAYEVENTMGR
-#define __KX_RAYEVENTMGR
+#ifndef __KX_RAYEVENTMANAGER_H__
+#define __KX_RAYEVENTMANAGER_H__
 #include "SCA_EventManager.h"
 #include <vector>
 using namespace std;
@@ -52,5 +52,5 @@ public:
 #endif
 };
 
-#endif //__KX_RAYEVENTMGR
+#endif //__KX_RAYEVENTMANAGER_H__
 
index 4c0009a5a4c408c19e915255f147123fb7a9f781..f5d1c72d09853ded064d7a442be1ffe88b993f87 100644 (file)
@@ -30,8 +30,8 @@
  *  \brief Cast a ray and feel for objects
  */
 
-#ifndef __KX_RAYSENSOR_H
-#define __KX_RAYSENSOR_H
+#ifndef __KX_RAYSENSOR_H__
+#define __KX_RAYSENSOR_H__
 
 #include "SCA_ISensor.h"
 #include "MT_Point3.h"
@@ -100,5 +100,5 @@ public:
 
 };
 
-#endif //__KX_RAYSENSOR_H
+#endif //__KX_RAYSENSOR_H__
 
index ec5cf305c3eb07be84f671614272c45a9ab96e46..d9cd1b5ff24818009f3589f8f93cbcbc7db41e98 100644 (file)
@@ -30,8 +30,8 @@
  * Please look here for revision history.
  */
 
-#ifndef __KX_SCA_AddObjectActuator
-#define __KX_SCA_AddObjectActuator
+#ifndef __KX_SCA_ADDOBJECTACTUATOR_H__
+#define __KX_SCA_ADDOBJECTACTUATOR_H__
 
 /* Actuator tree */
 #include "SCA_IActuator.h"
index 5fefbb8cca531ce8bcf0ad21c1416862696ecd76..885c7a0297fa808e660dec8dcc61f5f8f590c7fa 100644 (file)
@@ -30,8 +30,8 @@
  *  \brief Add object to the game world on action of this actuator
  */
 
-#ifndef __KX_SCA_DYNAMICACTUATOR
-#define __KX_SCA_DYNAMICACTUATOR
+#ifndef __KX_SCA_DYNAMICACTUATOR_H__
+#define __KX_SCA_DYNAMICACTUATOR_H__
 
 #include "SCA_IActuator.h"
 #include "SCA_PropertyActuator.h"
index 7a325257e591b9d15a1c517c806e34bcbad22980..374d5f2f2115244e482db1d106fca2bda855ae67 100644 (file)
@@ -32,8 +32,8 @@
  * Please look here for revision history.
  */
 
-#ifndef __KX_SCA_ENDOBJECTACTUATOR
-#define __KX_SCA_ENDOBJECTACTUATOR
+#ifndef __KX_SCA_ENDOBJECTACTUATOR_H__
+#define __KX_SCA_ENDOBJECTACTUATOR_H__
 
 #include "SCA_IActuator.h"
 
index 3e07ec2665c627b63be63c9a5b30df7972932a21..c8e6123024d73fb6a55eeb520971ccf10db36acf 100644 (file)
@@ -32,8 +32,8 @@
  *  Please look here for revision history.
  */
 
-#ifndef __KX_SCA_REPLACEMESHACTUATOR
-#define __KX_SCA_REPLACEMESHACTUATOR
+#ifndef __KX_SCA_REPLACEMESHACTUATOR_H__
+#define __KX_SCA_REPLACEMESHACTUATOR_H__
 
 #include "SCA_IActuator.h"
 #include "SCA_PropertyActuator.h"
index 0eff0ea62babd2a3d3d54c06044ab15d4246f4a0..734f82731b866ae6cff95384f4207e90a4868efb 100644 (file)
@@ -30,8 +30,8 @@
  *  \ingroup ketsji
  */
 
-#ifndef __KX_SG_BONEPARENTRELATION_H__
-#define __KX_SG_BONEPARENTRELATION_H__
+#ifndef __KX_SG_BONEPARENTNODERELATIONSHIP_H__
+#define __KX_SG_BONEPARENTNODERELATIONSHIP_H__
  
 #include "SG_Spatial.h"
 #include "SG_ParentRelation.h"
index 94fea9687a5f96604f4a96948bdec6ad0854812b..44864c87cd7413484c92c6601f6622e35a740e1d 100644 (file)
@@ -39,8 +39,8 @@
  * inherited by the child. 
  */
 
-#ifndef __KX_SG_NODERELATIONS_H__
-#define __KX_SG_NODERELATIONS_H__
+#ifndef __KX_SG_NODERELATIONSHIPS_H__
+#define __KX_SG_NODERELATIONSHIPS_H__
 
 #include "SG_Spatial.h"
 #include "SG_ParentRelation.h"
index 9e5a43ecff98c87591cf5481ebc69831c7e08c2d..d08a32ce0aa12a0ae2f965379bdf9c2821f89646 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup ketsji
  */
 
-#ifndef KX_SCALARINTERPOLATOR
-#define KX_SCALARINTERPOLATOR
+#ifndef __KX_SCALARINTERPOLATOR_H__
+#define __KX_SCALARINTERPOLATOR_H__
 
 #include "MT_Scalar.h"
 #include "KX_IInterpolator.h"
index 520706b97211f99515241a1293c2ca35cabb0425..ae8b25f9185d558fb67ee1b96b0660a6f53a5bb4 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup ketsji
  */
 
-#ifndef KX_SCALINGINTERPOLATOR
-#define KX_SCALINGINTERPOLATOR
+#ifndef __KX_SCALINGINTERPOLATOR_H__
+#define __KX_SCALINGINTERPOLATOR_H__
 
 #include "KX_IInterpolator.h"
 
index 8fcfe46e643d869254185b478e153db01c51bca2..ca57548be2ae2c2d7e46cf950532cdf7b1265ac8 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup ketsji
  */
 
-#ifndef __KX_SCENE_H
-#define __KX_SCENE_H
+#ifndef __KX_SCENE_H__
+#define __KX_SCENE_H__
 
 
 #include "KX_PhysicsEngineEnums.h"
@@ -665,5 +665,5 @@ public:
 
 typedef std::vector<KX_Scene*> KX_SceneList;
 
-#endif //__KX_SCENE_H
+#endif //__KX_SCENE_H__
 
index 9064146a1d4e625f5775a6b141fcc94e9fcf3042..774f740dd008a4b222bc4d6f8abe78f27ef18546 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup ketsji
  */
 
-#ifndef __KX_SCENEACTUATOR
-#define __KX_SCENEACTUATOR
+#ifndef __KX_SCENEACTUATOR_H__
+#define __KX_SCENEACTUATOR_H__
 
 #include "SCA_IActuator.h"
 #include "SCA_IScene.h" /* Replace_IScene only */
index b9119677f4f26f372ad8f295c4509c0244d25e8f..71ec3ae2f597210cac121fb76ae3cd6773ab90fe 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup ketsji
  */
 
-#ifndef __KX_SOUNDACTUATOR
-#define __KX_SOUNDACTUATOR
+#ifndef __KX_SOUNDACTUATOR_H__
+#define __KX_SOUNDACTUATOR_H__
 
 #include "SCA_IActuator.h"
 
@@ -127,5 +127,5 @@ public:
 
 };
 
-#endif //__KX_SOUNDACTUATOR
+#endif //__KX_SOUNDACTUATOR_H__
 
index aa17b68746342592c6e8bf59e616540518b839cc..5ed065d3604d1dd616e608bcfa0dac32774e0fba 100644 (file)
@@ -30,8 +30,8 @@
  *  \brief Actuator to toggle visibility/invisibility of objects
  */
 
-#ifndef __KX_STATEACTUATOR
-#define __KX_STATEACTUATOR
+#ifndef __KX_STATEACTUATOR_H__
+#define __KX_STATEACTUATOR_H__
 
 #include "SCA_IActuator.h"
 
index 0e9d4c7e3a090f9e8a80bc5e5d1c8fce51e79d5d..f0c3e73ddecd9f9c0ef583550083f022bc262d80 100644 (file)
@@ -24,8 +24,8 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-#ifndef __KX_STEERINGACTUATOR
-#define __KX_STEERINGACTUATOR
+#ifndef __KX_STEERINGACTUATOR_H__
+#define __KX_STEERINGACTUATOR_H__
 
 #include "SCA_IActuator.h"
 #include "SCA_LogicManager.h"
index 9c9df290e438def720f311e6858db0a87b7b0858..f01e405d3dfeaa9e26e78332ace667e7826bd123 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup ketsji
  */
 
-#ifndef __KX_TIME_CATEGORY_LOGGER_H
-#define __KX_TIME_CATEGORY_LOGGER_H
+#ifndef __KX_TIMECATEGORYLOGGER_H__
+#define __KX_TIMECATEGORYLOGGER_H__
 
 #if defined(WIN32) && !defined(FREE_WINDOWS)
 #pragma warning (disable:4786) // suppress stl-MSVC debug info warning
@@ -135,5 +135,5 @@ public:
 #endif
 };
 
-#endif // __KX_TIME_CATEGORY_LOGGER_H
+#endif // __KX_TIMECATEGORYLOGGER_H__
 
index 0f29f44e726cbfc0d12a701960098e9b41f8640d..16d97c1fe41abe9d6ddb184f470e8adb41d1a387 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup ketsji
  */
 
-#ifndef __KX_TIME_LOGGER_H
-#define __KX_TIME_LOGGER_H
+#ifndef __KX_TIMELOGGER_H__
+#define __KX_TIMELOGGER_H__
 
 #if defined(WIN32) && !defined(FREE_WINDOWS)
 #pragma warning (disable:4786) // suppress stl-MSVC debug info warning
@@ -113,5 +113,5 @@ public:
 #endif
 };
 
-#endif // __KX_TIME_LOGGER_H
+#endif // __KX_TIMELOGGER_H__
 
index b219f334b8427275426b98ea3498a253c9af48b7..38286cba9aa1a3910b8f3182d13bba6639d72062 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup ketsji
  */
 
-#ifndef __KX_TOUCHEVENTMANAGER
-#define __KX_TOUCHEVENTMANAGER
+#ifndef __KX_TOUCHEVENTMANAGER_H__
+#define __KX_TOUCHEVENTMANAGER_H__
 
 
 #include "SCA_EventManager.h"
@@ -87,5 +87,5 @@ public:
 #endif
 };
 
-#endif //__KX_TOUCHEVENTMANAGER
+#endif //__KX_TOUCHEVENTMANAGER_H__
 
index 1fae766aa1377ba24fc8cdad680270465db8b753..1ce1742ed464412fafb8b1573ad9ce8fb3bc2fa7 100644 (file)
@@ -30,8 +30,8 @@
  *  \brief Senses touch and collision events
  */
 
-#ifndef __KX_TOUCHSENSOR
-#define __KX_TOUCHSENSOR
+#ifndef __KX_TOUCHSENSOR_H__
+#define __KX_TOUCHSENSOR_H__
 
 #include "SCA_ISensor.h"
 #include "ListValue.h"
@@ -132,5 +132,5 @@ public:
        
 };
 
-#endif //__KX_TOUCHSENSOR
+#endif //__KX_TOUCHSENSOR_H__
 
index 30e276c00215c884883ec7f80ce0733f93c00968..8eb69b1ad080218eeb6e8178e119e33fad76bee4 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup ketsji
  */
 
-#ifndef __KX_TrackToActuator
-#define __KX_TrackToActuator
+#ifndef __KX_TRACKTOACTUATOR_H__
+#define __KX_TRACKTOACTUATOR_H__
 
 #include "SCA_IActuator.h"
 #include "SCA_IObject.h"
index f6e360d34a86076dfcaedc3ad96ac6a918cce877..3684019277cdfaa5e47db6512c112af9df12beb5 100644 (file)
@@ -3,8 +3,8 @@
  *  \ingroup ketsji
  */
 
-#ifndef KX_VEHICLE_WRAPPER
-#define KX_VEHICLE_WRAPPER
+#ifndef __KX_VEHICLEWRAPPER_H__
+#define __KX_VEHICLEWRAPPER_H__
 
 #include "Value.h"
 #include "PHY_DynamicTypes.h"
@@ -59,4 +59,4 @@ private:
        PHY_IPhysicsEnvironment* m_physenv;
 };
 
-#endif //KX_VEHICLE_WRAPPER
+#endif //__KX_VEHICLEWRAPPER_H__
index 905a4e0f4ab833408493634319097901d0c2ec8e..baed5330f7e41ebb6136c56cb804ba6ae5e3c78b 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup ketsji
  */
 
-#ifndef __KX_VERTEXPROXY
-#define __KX_VERTEXPROXY
+#ifndef __KX_VERTEXPROXY_H__
+#define __KX_VERTEXPROXY_H__
 
 #ifdef WITH_PYTHON
 
@@ -107,5 +107,5 @@ public:
 
 #endif // WITH_PYTHON
 
-#endif //__KX_VERTEXPROXY
+#endif //__KX_VERTEXPROXY_H__
 
index f5c45ecbd99afe9ecaef2c06424763c399074ba7..a207844db7487df2841ef30b359fe047b1c1b67a 100644 (file)
@@ -30,8 +30,8 @@
  *  \brief Actuator to toggle visibility/invisibility of objects
  */
 
-#ifndef __KX_VISIBILITYACTUATOR
-#define __KX_VISIBILITYACTUATOR
+#ifndef __KX_VISIBILITYACTUATOR_H__
+#define __KX_VISIBILITYACTUATOR_H__
 
 #include "SCA_IActuator.h"
 
index c5ce5480409adea25436556527f3ac589e920c42..cb4e9de50c225b0b05f0879815029e8995c1a195 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup ketsji
  */
 
-#ifndef __KX_WORLDINFO_H
-#define __KX_WORLDINFO_H
+#ifndef __KX_WORLDINFO_H__
+#define __KX_WORLDINFO_H__
 
 #include "MT_Scalar.h"
 
@@ -76,5 +76,5 @@ public:
 #endif
 };
 
-#endif //__KX_WORLDINFO_H
+#endif //__KX_WORLDINFO_H__
 
index 5c55e4fdc63562e6a9a6fcb0bd766f09f4a89805..1f60280e35509a340422c9cd83a515c0fc8f5267 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup ketsji
  */
 
-#ifndef KX_WORLDIPOCONTROLLER_H
-#define KX_WORLDIPOCONTROLLER_H
+#ifndef __KX_WORLDIPOCONTROLLER_H__
+#define __KX_WORLDIPOCONTROLLER_H__
 
 #include "SG_Controller.h"
 #include "SG_Spatial.h"
@@ -102,5 +102,5 @@ public:
 #endif
 };
 
-#endif // KX_LIGHTIPOSGCONTROLLER_H
+#endif // __KX_WORLDIPOCONTROLLER_H__
 
index 968d56b2473a59f5b3a828e3aa23b2a372bd14eb..a356b20ed1a02b9ed9809c748c722cbbc9d9576e 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup bgenetlb
  *  \brief LoopbackNetworkDeviceInterface derived from NG_NetworkDeviceInterface
  */
-#ifndef NG_LOOPBACKNETWORKDEVICEINTERFACE_H
-#define NG_LOOPBACKNETWORKDEVICEINTERFACE_H
+#ifndef __NG_LOOPBACKNETWORKDEVICEINTERFACE_H__
+#define __NG_LOOPBACKNETWORKDEVICEINTERFACE_H__
 
 #include <deque>
 #include "NG_NetworkDeviceInterface.h"
@@ -58,5 +58,5 @@ public:
        virtual std::vector<NG_NetworkMessage*>         RetrieveNetworkMessages();
 };
 
-#endif //NG_LOOPBACKNETWORKDEVICEINTERFACE_H
+#endif //__NG_LOOPBACKNETWORKDEVICEINTERFACE_H__
 
index ce5720c070fe63e7c20aca9fa60cedafaa1c4c9d..d4a3d12057ec5b8a67c59538357be1515c3b1937 100644 (file)
@@ -31,8 +31,8 @@
  * To be derived by loopback and network libraries
  */
 
-#ifndef NG_NETWORKDEVICEINTERFACE_H
-#define NG_NETWORKDEVICEINTERFACE_H
+#ifndef __NG_NETWORKDEVICEINTERFACE_H__
+#define __NG_NETWORKDEVICEINTERFACE_H__
 
 #include "NG_NetworkMessage.h"
 #include <vector>
@@ -81,5 +81,5 @@ public:
 #endif
 };
 
-#endif //NG_NETWORKDEVICEINTERFACE_H
+#endif //__NG_NETWORKDEVICEINTERFACE_H__
 
index 75da167ea3ea8cc451af47e8b334881179966bf3..a0c61784e9fe9195498fe5abca512598a5c3a0cc 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup bgenet
  *  \brief generic Network Message class
  */
-#ifndef NG_NETWORKMESSAGE_H
-#define NG_NETWORKMESSAGE_H
+#ifndef __NG_NETWORKMESSAGE_H__
+#define __NG_NETWORKMESSAGE_H__
 
 #include "STR_HashedString.h"
 
@@ -137,5 +137,5 @@ public:
 #endif
 };
 
-#endif //NG_NETWORKMESSAGE_H
+#endif //__NG_NETWORKMESSAGE_H__
 
index b3f5a180aad76caa11e64a6cd432f72870c4461d..b7b01bdad067113b01f41eed0558e0b6b34ac6d3 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup bgenet
  *  \brief generic Network Object class
  */
-#ifndef NG_NETWORKOBJECT_H
-#define NG_NETWORKOBJECT_H
+#ifndef __NG_NETWORKOBJECT_H__
+#define __NG_NETWORKOBJECT_H__
 
 #include "STR_String.h"
 
@@ -54,5 +54,5 @@ public:
 #endif
 };
 
-#endif //NG_NETWORKOBJECT_H
+#endif //__NG_NETWORKOBJECT_H__
 
index c0469f21850a5ddcb994cc2557512179867160cf..cd6f992558228505016da3ddfd61633da28eeb6f 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup bgenet
  *  \brief NetworkSceneManagement generic class
  */
-#ifndef __NG_NETWORKSCENE_H
-#define __NG_NETWORKSCENE_H
+#ifndef __NG_NETWORKSCENE_H__
+#define __NG_NETWORKSCENE_H__
 
 #include "CTR_Map.h"
 #include "STR_HashedString.h"
@@ -117,5 +117,5 @@ public:
 #endif
 };
 
-#endif //__NG_NETWORKSCENE_H
+#endif //__NG_NETWORKSCENE_H__
 
index d0cb899cb74ea615602fd86f7f1404b18fd3c7e8..07878b7162ec323d44c20236503c12963aeaa9ef 100644 (file)
@@ -18,8 +18,8 @@ subject to the following restrictions:
  */
 
 
-#ifndef BULLET2_GRAPHICCONTROLLER_H
-#define BULLET2_GRAPHICCONTROLLER_H
+#ifndef __CCDGRAPHICCONTROLLER_H__
+#define __CCDGRAPHICCONTROLLER_H__
 
 #include "PHY_IGraphicController.h"
 
index 82acd64161f58336c9df678a59fd6a44aa58b50c..33b30758ff029f51ab9c0e962af65706e10164c8 100644 (file)
@@ -18,8 +18,8 @@ subject to the following restrictions:
  */
 
 
-#ifndef BULLET2_PHYSICSCONTROLLER_H
-#define BULLET2_PHYSICSCONTROLLER_H
+#ifndef __CCDPHYSICSCONTROLLER_H__
+#define __CCDPHYSICSCONTROLLER_H__
 
 #include <vector>
 #include <map>
@@ -656,4 +656,4 @@ public:
 };
 
 
-#endif //BULLET2_PHYSICSCONTROLLER_H
+#endif //__CCDPHYSICSCONTROLLER_H__
index 1eed0665564e1479755e2ba8f52e7d69c771eb62..1315bc732a2ecf519087e04096e8d3b5e4e00355 100644 (file)
@@ -18,8 +18,8 @@ subject to the following restrictions:
  *  See also \ref bulletdoc
  */
 
-#ifndef CCDPHYSICSENVIRONMENT
-#define CCDPHYSICSENVIRONMENT
+#ifndef __CCDPHYSICSENVIRONMENT_H__
+#define __CCDPHYSICSENVIRONMENT_H__
 
 #include "PHY_IPhysicsEnvironment.h"
 #include <vector>
@@ -294,4 +294,4 @@ public:
 #endif
 };
 
-#endif //CCDPHYSICSENVIRONMENT
+#endif //__CCDPHYSICSENVIRONMENT_H__
index d0073d772c88653e4b233f863f3bbc376d39babe..8e55c4a0c0f3da117761e89533de1dfe1bb76caa 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup physdummy
  */
 
-#ifndef _DUMMYPHYSICSENVIRONMENT
-#define _DUMMYPHYSICSENVIRONMENT
+#ifndef __DUMMYPHYSICSENVIRONMENT_H__
+#define __DUMMYPHYSICSENVIRONMENT_H__
 
 #include "PHY_IPhysicsEnvironment.h"
 
@@ -104,5 +104,5 @@ public:
 #endif
 };
 
-#endif //_DUMMYPHYSICSENVIRONMENT
+#endif //__DUMMYPHYSICSENVIRONMENT_H__
 
index a1761131a8e983d0e5f1fb474c93eee9630c803c..a72929d25c5f246198067031ff5431c0445eb421 100644 (file)
@@ -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__
index 672f2e5a65522f813e9d0f9ee0e849b8a6d1ede7..d25af9f898c177032bfb494dd60298ba033f0a16 100644 (file)
@@ -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__
 
index 46f17014090c8fbfc8d528a45b6818527ec506cc..6a94b3d6ea927c81e45675e90ed032f82f899420 100644 (file)
@@ -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__
 
index 1ffd3adac9a6c0298f1e30c2334f974bd641e45f..77c51ebdb79c2725eead2661e36b102d358b0dea 100644 (file)
@@ -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__
 
index 31a7d71745e9b2871bc9199374e218eaa048b426..727cbda931d029d8e3b663c31e96a199da089458 100644 (file)
@@ -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__
 
index adf6fb03bc11764234d09d504dd8d36e41072213..f64f55b659260358264eddec00fc2d0ce178663b 100644 (file)
@@ -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__
 
index da9daa299776d41cc87ae9c9ca02daa8f75a7682..735ce5a87912f9481e97677ba49821e696d38079 100644 (file)
@@ -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__
index 4189db27c176e4b956035ff6cdd6a95633a53417..110d4731cdc012ef5136387387e50d2449ae6082 100644 (file)
@@ -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__
 
index 4510747c0e5ef83ab1969a99c1564266a5d65169..d3b23deab52cb55dbec0bc174a0e156c6e2429d1 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup bgerast
  */
 
-#ifndef __RAS_I2DFILTER
-#define __RAS_I2DFILTER
+#ifndef __RAS_2DFILTERMANAGER_H__
+#define __RAS_2DFILTERMANAGER_H__
 
 #include "RAS_ICanvas.h"
 #define MAX_RENDER_PASS        100
index b4b5465fdb6601b0547ccd2148f3ffdec8e7e5ef..032d9b03299cbae209f607ffd4f3d48233bfe232 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup bgerast
  */
 
-#ifndef __RAS_BUCKETMANAGER
-#define __RAS_BUCKETMANAGER
+#ifndef __RAS_BUCKETMANAGER_H__
+#define __RAS_BUCKETMANAGER_H__
 
 #include "MT_Transform.h"
 #include "RAS_MaterialBucket.h"
@@ -91,5 +91,5 @@ public:
 #endif
 };
 
-#endif //__RAS_BUCKETMANAGER
+#endif //__RAS_BUCKETMANAGER_H__
 
index 2120a18f1394cd295dd6a6634889f08ab7fe7935..4a70df6e50585b85e5029eb83cbf53d49db4d007 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup bgerast
  */
 
-#ifndef __RAS_CAMERADATA_H
-#define __RAS_CAMERADATA_H
+#ifndef __RAS_CAMERADATA_H__
+#define __RAS_CAMERADATA_H__
 
 struct RAS_CameraData
 {
@@ -71,5 +71,5 @@ struct RAS_CameraData
        }
 };
 
-#endif //__RAS_CAMERADATA_H
+#endif //__RAS_CAMERADATA_H__
 
index 6113589c39f2c91b9be1ec55b552dde7ef82da49..1e9a792634ac2870d53a0fbbde9e45aa36f7e75f 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup bgerast
  */
 
-#ifndef RAS_DEFORMER
-#define RAS_DEFORMER
+#ifndef __RAS_DEFORMER_H__
+#define __RAS_DEFORMER_H__
 
 #if defined(WIN32) && !defined(FREE_WINDOWS)
 #pragma warning (disable:4786) // get rid of stupid stl-visual compiler debug warning
index 612142234e39144194c7ddc6783d0b99d783fcff..4ea2d99819079a2e6cd7d7988ef24b60f676d6cd 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup bgerast
  */
 
-#ifndef RAS_FRAMINGMANAGER_H
-#define RAS_FRAMINGMANAGER_H
+#ifndef __RAS_FRAMINGMANAGER_H__
+#define __RAS_FRAMINGMANAGER_H__
 
 #ifdef WITH_CXX_GUARDEDALLOC
 #include "MEM_guardedalloc.h"
index 2c2f62c946eb1914efd6b0675416795efca002af..e35ec1d16d219b485b4a442f9a4849e5dac6bb7f 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup bgerast
  */
 
-#ifndef __RAS_ICANVAS
-#define __RAS_ICANVAS
+#ifndef __RAS_ICANVAS_H__
+#define __RAS_ICANVAS_H__
 
 #ifdef WITH_CXX_GUARDEDALLOC
 #include "MEM_guardedalloc.h"
@@ -225,5 +225,5 @@ public:
 #endif
 };
 
-#endif //__RAS_ICANVAS
+#endif //__RAS_ICANVAS_H__
 
index 6527b0d58ce51e46abd3677473c1e007d0fb1306..0da0b17f6c11deebfd219b24fa5c2b3571725d35 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup bgerast
  */
 
-#ifndef __RAS_IPOLYGONMATERIAL
-#define __RAS_IPOLYGONMATERIAL
+#ifndef __RAS_IPOLYGONMATERIAL_H__
+#define __RAS_IPOLYGONMATERIAL_H__
 
 #include "STR_HashedString.h"
 
@@ -204,5 +204,5 @@ inline  bool operator < ( const RAS_IPolyMaterial & lhs, const RAS_IPolyMaterial
        return lhs.Less(rhs);
 }
 
-#endif //__RAS_IPOLYGONMATERIAL
+#endif //__RAS_IPOLYGONMATERIAL_H__
 
index 70b91cc826f75a6a21eba3540052eb239d27675f..c749868cf79d138af47cfbdf60667a702609eff1 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup bgerast
  */
 
-#ifndef __RAS_IRASTERIZER
-#define __RAS_IRASTERIZER
+#ifndef __RAS_IRASTERIZER_H__
+#define __RAS_IRASTERIZER_H__
 
 #if defined(WIN32) && !defined(FREE_WINDOWS)
 #pragma warning (disable:4786)
@@ -425,6 +425,6 @@ public:
 #endif
 };
 
-#endif //__RAS_IRASTERIZER
+#endif //__RAS_IRASTERIZER_H__
 
 
index b7e81e1a2521dc2804df7427d9ef1079b9e1276e..27b328412d2c65aa17f3660e3c7859883b84ff8b 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup bgerast
  */
 
-#ifndef __RAS_IRENDERTOOLS
-#define __RAS_IRENDERTOOLS
+#ifndef __RAS_IRENDERTOOLS_H__
+#define __RAS_IRENDERTOOLS_H__
 
 #include "MT_Transform.h"
 #include "RAS_IRasterizer.h"
@@ -210,7 +210,7 @@ public:
 #endif
 };
 
-#endif //__RAS_IRENDERTOOLS
+#endif //__RAS_IRENDERTOOLS_H__
 
 
 
index 78e57e2b78646eabcef6bee15e74cd4478790c57..c378a9ea0c2085e45678e143e6431b7287274013 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup bgerast
  */
 
-#ifndef __RAS_LIGHTOBJECT_H
-#define __RAS_LIGHTOBJECT_H
+#ifndef __RAS_LIGHTOBJECT_H__
+#define __RAS_LIGHTOBJECT_H__
 
 #include "MT_CmMatrix4x4.h"
 
@@ -64,5 +64,5 @@ struct RAS_LightObject
        bool    m_nospecular;
 };
 
-#endif //__RAS_LIGHTOBJECT_H
+#endif //__RAS_LIGHTOBJECT_H__
 
index 5c8e2f2c0859e98121dce7ccbc5eb7449004f996..4142ebd2e3914dbc73d741e77705e46b6593baec 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup bgerast
  */
 
-#ifndef __RAS_MATERIALBUCKET
-#define __RAS_MATERIALBUCKET
+#ifndef __RAS_MATERIALBUCKET_H__
+#define __RAS_MATERIALBUCKET_H__
 
 #include "RAS_TexVert.h"
 #include "CTR_Map.h"
index 982ce488a82bad2780a4684368bc3ac9a40059cf..b3e84c4656b0876fe9c86369407139cff424af32 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup bgerast
  */
 
-#ifndef __RAS_MESHOBJECT
-#define __RAS_MESHOBJECT
+#ifndef __RAS_MESHOBJECT_H__
+#define __RAS_MESHOBJECT_H__
 
 #if defined(WIN32) && !defined(FREE_WINDOWS)
 // disable the STL warnings ("debug information length > 255")
@@ -179,5 +179,5 @@ public:
 #endif
 };
 
-#endif //__RAS_MESHOBJECT
+#endif //__RAS_MESHOBJECT_H__
 
index ad2002ebc82b071a9f3c45a4a2be9bc19a38cdb3..f8fbe69e97b18ec46a1469d42ea71a550f77efaa 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup bgerast
  */
 
-#ifndef __RAS_OBJECTCOLOR_H
-#define __RAS_OBJECTCOLOR_H
+#ifndef __RAS_OBJECTCOLOR_H__
+#define __RAS_OBJECTCOLOR_H__
 
 struct RAS_ObjectColor {
        float   m_red;
@@ -38,5 +38,5 @@ struct        RAS_ObjectColor {
        float   m_blue;
 };
 
-#endif //__RAS_OBJECTCOLOR_H
+#endif //__RAS_OBJECTCOLOR_H__
 
index 3a3ea57d67b576a9648ca0b276b758fcba8dbca2..c2595fb0d269280433ed09e14cf5cbe977c2f5ea 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup bgerastoglfilters
  */
 
-#ifndef __RAS_BLUR2DFILTER
-#define __RAS_BLUR2DFILTER
+#ifndef __RAS_BLUR2DFILTER_H__
+#define __RAS_BLUR2DFILTER_H__
 
 const char * BlurFragmentShader=STRINGIFY(
 uniform sampler2D bgl_RenderedTexture;
index f486be47f9f1f07cfd626d3539803881779a3c68..12b815a15196b078d5d8ec8cead0a4c1fa497903 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup bgerastoglfilters
  */
 
-#ifndef __RAS_DILATION2DFILTER
-#define __RAS_DILATION2DFILTER
+#ifndef __RAS_DILATION2DFILTER_H__
+#define __RAS_DILATION2DFILTER_H__
 
 const char * DilationFragmentShader=STRINGIFY(
 uniform sampler2D bgl_RenderedTexture;
index a1755dc0eeb9d566f27918f20a115a4233ba88c0..6319be6ce4a4d35e6c17db0c65f3e4b1ebea5ac3 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup bgerastoglfilters
  */
 
-#ifndef __RAS_EROSION2DFILTER
-#define __RAS_EROSION2DFILTER
+#ifndef __RAS_EROSION2DFILTER_H__
+#define __RAS_EROSION2DFILTER_H__
 
 const char * ErosionFragmentShader=STRINGIFY(
             uniform sampler2D bgl_RenderedTexture;
index baf3d9c11661f74fd2cb3362837f6bb352b1f555..f3c3aece7d55e606e2c37dfe3a81f1c02a6f5708 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup bgerastoglfilters
  */
 
-#ifndef __RAS_GRAYSCALE2DFILTER
-#define __RAS_GRAYSCALE2DFILTER
+#ifndef __RAS_GRAYSCALE2DFILTER_H__
+#define __RAS_GRAYSCALE2DFILTER_H__
 
 const char * GrayScaleFragmentShader=STRINGIFY(
 uniform sampler2D bgl_RenderedTexture;
index 7df271c15e4c144ef6332fe86fdf62c66b7ab77c..c04d9543e89d4a8f1bd6b28948be56c3c64756e5 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup bgerastoglfilters
  */
 
-#ifndef __RAS_INVERT2DFILTER
-#define __RAS_INVERT2DFILTER
+#ifndef __RAS_INVERT2DFILTER_H__
+#define __RAS_INVERT2DFILTER_H__
 
 const char * InvertFragmentShader=STRINGIFY(
 uniform sampler2D bgl_RenderedTexture;
index 45c94d358baa0ded0986bbfbde3298c14e898aae..47f7d80d9d716407eed9a5467124d95915110af1 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup bgerastoglfilters
  */
 
-#ifndef __RAS_LAPLACION2DFILTER
-#define __RAS_LAPLACION2DFILTER
+#ifndef __RAS_LAPLACIAN2DFILTER_H__
+#define __RAS_LAPLACIAN2DFILTER_H__
 
 const char * LaplacionFragmentShader=STRINGIFY(
 uniform sampler2D bgl_RenderedTexture;
index 8d08d9077cb20048cd005e1381bdd944aecae1b9..8b2fdc71cfb9e308d4b3c10e85b3b592df834636 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup bgerastoglfilters
  */
 
-#ifndef __RAS_PREWITT2DFILTER
-#define __RAS_PREWITT2DFILTER
+#ifndef __RAS_PREWITT2DFILTER_H__
+#define __RAS_PREWITT2DFILTER_H__
 
 const char * PrewittFragmentShader=STRINGIFY(
 uniform sampler2D bgl_RenderedTexture;
index 5c1c18c30c12f4c0c12631a61e153a8e757ed492..b38d14a3746ddb7181afbdc5535fcc3aca5eacdc 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup bgerastoglfilters
  */
 
-#ifndef __RAS_SEPIA2DFILTER
-#define __RAS_SEPIA2DFILTER
+#ifndef __RAS_SEPIA2DFILTER_H__
+#define __RAS_SEPIA2DFILTER_H__
 
 const char * SepiaFragmentShader=STRINGIFY(
 uniform sampler2D bgl_RenderedTexture;
index a9c827fa9e1bf5262844d0b06f019f76c7a7c4b1..2e0edae61c4d95ea1b09e059a5ed3dd0dad5fe6e 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup bgerastoglfilters
  */
 
-#ifndef __RAS_SHARPEN2DFILTER
-#define __RAS_SHARPEN2DFILTER
+#ifndef __RAS_SHARPEN2DFILTER_H__
+#define __RAS_SHARPEN2DFILTER_H__
 
 const char * SharpenFragmentShader=STRINGIFY(
 uniform sampler2D bgl_RenderedTexture;
index 350ce19fafdc38b24e391754be812ec051e2dad6..ba30e4979230b78b4feb199479ca696df3d90813 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup bgerastoglfilters
  */
 
-#ifndef __RAS_SOBEL2DFILTER
-#define __RAS_SOBEL2DFILTER
+#ifndef __RAS_SOBEL2DFILTER_H__
+#define __RAS_SOBEL2DFILTER_H__
 
 const char * SobelFragmentShader=STRINGIFY(
 uniform sampler2D bgl_RenderedTexture;
index 48705c3047adb6e9bdc215731e1e078561e941c8..e10d006994fe93954b91491ff4721aa183eb183a 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup bgerastogl
  */
 
-#ifndef __RAS_OPENGLRASTERIZER
-#define __RAS_OPENGLRASTERIZER
+#ifndef __RAS_OPENGLRASTERIZER_H__
+#define __RAS_OPENGLRASTERIZER_H__
 
 #if defined(WIN32) && !defined(FREE_WINDOWS)
 #pragma warning (disable:4786)
@@ -324,6 +324,6 @@ public:
 #endif
 };
 
-#endif //__RAS_OPENGLRASTERIZER
+#endif //__RAS_OPENGLRASTERIZER_H__
 
 
index c0c6f5d060ca86f35a8a6f9a341974eb20c51a7a..d96f390ad74bd9bdc225d5e23cf02f956b93f73c 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup bgerastogl
  */
 
-#ifndef __KX_VERTEXARRAYOPENGLRASTERIZER
-#define __KX_VERTEXARRAYOPENGLRASTERIZER
+#ifndef __RAS_VAOPENGLRASTERIZER_H__
+#define __RAS_VAOPENGLRASTERIZER_H__
 
 #include "RAS_OpenGLRasterizer.h"
 
@@ -69,5 +69,5 @@ public:
 #endif
 };
 
-#endif //__KX_VERTEXARRAYOPENGLRASTERIZER
+#endif //__RAS_VAOPENGLRASTERIZER_H__
 
index 6e2d724cefe67b6527975dc545218394566b3c4d..a3bd6b600c911ccd2d92a6a507596741ef08f0cc 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup bgerast
  */
 
-#ifndef __RAS_POLYGON
-#define __RAS_POLYGON
+#ifndef __RAS_POLYGON_H__
+#define __RAS_POLYGON_H__
 
 #include "RAS_TexVert.h"
 #include "RAS_MaterialBucket.h"
index d307a1f62eeb600cd42ec9f88091f2f690bad8d3..c845c2c21bde93bd6d2989a5cc200b6cda909692 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup bgerast
  */
 
-#ifndef _RAS_RECT
-#define _RAS_RECT
+#ifndef __RAS_RECT_H__
+#define __RAS_RECT_H__
 
 #ifdef WITH_CXX_GUARDEDALLOC
 #include "MEM_guardedalloc.h"
@@ -102,5 +102,5 @@ public:
 #endif
 };
 
-#endif // _RAS_RECT
+#endif // __RAS_RECT_H__
 
index 125e8596ad2b277a6da0f07fd66ada298bebb9fd..44ae1b0eb5d0eb800cd4196c6885460b887408fe 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup bgerast
  */
 
-#ifndef __RASTEXMATRIX
-#define __RASTEXMATRIX
+#ifndef __RAS_TEXMATRIX_H__
+#define __RAS_TEXMATRIX_H__
 
 #include "MT_Matrix3x3.h"
 #include "MT_Point3.h"
@@ -39,5 +39,5 @@
 
 void RAS_CalcTexMatrix(RAS_TexVert p[3],MT_Point3& origin,MT_Vector3& udir,MT_Vector3& vdir);
 
-#endif //__RASTEXMATRIX
+#endif //__RAS_TEXMATRIX_H__
 
index 64ebb53baa252634900fc18a612c7174a9c6c293..f76c6a66c86a1664c4db9b150b6ca84d5aecfcd3 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup bgerast
  */
 
-#ifndef __RAS_TEXVERT
-#define __RAS_TEXVERT
+#ifndef __RAS_TEXVERT_H__
+#define __RAS_TEXVERT_H__
 
 
 #include "MT_Point3.h"
@@ -149,5 +149,5 @@ public:
 #endif
 };
 
-#endif //__RAS_TEXVERT
+#endif //__RAS_TEXVERT_H__
 
index dd4ed0755cbd43f52bd37914b9059aad386c17c6..f6361d2c99281496b77fb5f36fb94a00e5bb3c9d 100644 (file)
@@ -32,8 +32,8 @@
  *  \ingroup bgesg
  */
  
-#ifndef __SG_CONTROLLER_H
-#define __SG_CONTROLLER_H
+#ifndef __SG_CONTROLLER_H__
+#define __SG_CONTROLLER_H__
 
 #include "SG_IObject.h"
 
@@ -124,5 +124,5 @@ protected:
 
 };
 
-#endif //__SG_CONTROLLER_H
+#endif //__SG_CONTROLLER_H__
 
index c4c71ca859f83425cff8b33decdbdf272fc205bf..90e3226f227ffd720d0fd1c13cba7e089066cad7 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup bgesg
  */
  
-#ifndef __SG_DLIST
-#define __SG_DLIST
+#ifndef __SG_DLIST_H__
+#define __SG_DLIST_H__
 
 #include <stdlib.h>
 
@@ -250,5 +250,5 @@ public:
 
 };
 
-#endif //__SG_DLIST
+#endif //__SG_DLIST_H__
 
index 764d92b6fd1824e73dc3f6f334f5065f4285031e..df14631d0d995d30fa0b47153f10173487771786 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup bgesg
  */
  
-#ifndef __SG_IOBJECT
-#define __SG_IOBJECT
+#ifndef __SG_IOBJECT_H__
+#define __SG_IOBJECT_H__
 
 #include "SG_QList.h"
 #include <vector>
@@ -373,5 +373,5 @@ public:
 #endif
 };
 
-#endif //__SG_IOBJECT
+#endif //__SG_IOBJECT_H__
 
index ad4c35198f86a0c9b7711108e136e79efd5632b9..d1991537cf913db899369990f61843aae1fedc9c 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup bgesg
  */
  
-#ifndef __SG_NODE_H
-#define __SG_NODE_H
+#ifndef __SG_NODE_H__
+#define __SG_NODE_H__
 
 #include "SG_Spatial.h"
 #include <vector>
@@ -277,5 +277,5 @@ public:
 #endif
 };
 
-#endif //__SG_NODE_H
+#endif //__SG_NODE_H__
 
index c704146160cd0d2400185fd5c88b94f051543b0d..07f11c87a36f6b5bdcb01c7309da3a671c89cb02 100644 (file)
@@ -49,8 +49,8 @@
  *
  */
  
-#ifndef __SG_ParentRelation_h
-#define __SG_ParentRelation_h
+#ifndef __SG_PARENTRELATION_H__
+#define __SG_PARENTRELATION_H__
 
 class SG_Spatial;
 
index 9df8f35f3a4c251d831606647d353c41f302c76c..e1288877b1d7d70cb2c5512d6ab81afcd963e2ff 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup bgesg
  */
  
-#ifndef __SG_QLIST
-#define __SG_QLIST
+#ifndef __SG_QLIST_H__
+#define __SG_QLIST_H__
 
 #include "SG_DList.h"
 
@@ -163,5 +163,5 @@ public:
 #endif
 };
 
-#endif //__SG_QLIST
+#endif //__SG_QLIST_H__
 
index 3f2f66c0e1cb6f10dbe734684de43d2259b81c78..085c2d12267607b74242bc7c9f9a6404ccca3d0a 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup bgesg
  */
  
-#ifndef __SG_SPATIAL_H
-#define __SG_SPATIAL_H
+#ifndef __SG_SPATIAL_H__
+#define __SG_SPATIAL_H__
 
 #include <MT_Vector3.h>
 #include <MT_Point3.h>
@@ -293,5 +293,5 @@ public:
 #endif
 };
 
-#endif //__SG_SPATIAL_H
+#endif //__SG_SPATIAL_H__