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

source/blender/blenkernel/BKE_key.h

@@ -92,4 +92,4 @@ extern int slurph_opt;
 };
 #endif
 
-#endif // __BKE_KEY_H__
+#endif  /* __BKE_KEY_H__ */

source/blender/blenkernel/BKE_multires.h

@@ -116,5 +116,4 @@ void multires_topology_changed(struct Mesh *me);
 void old_mdisps_bilinear(float out[3], float (*disps)[3], const int st, float u, float v);
 int mdisp_rot_face_to_crn(const int corners, const int face_side, const float u, const float v, float *x, float *y);
 
-#endif // __BKE_MULTIRES_H__
-
+#endif  /* __BKE_MULTIRES_H__ */

source/blender/blenkernel/BKE_navmesh_conversion.h

@@ -60,4 +60,4 @@ int polyFindVertex(const unsigned short *p, const int vertsPerPoly, unsigned sho
 float distPointToSegmentSq(const float *point, const float *a, const float *b);
 
 
-#endif //NAVMESH_CONVERSION_H
+#endif  /* NAVMESH_CONVERSION_H */

source/blender/blenkernel/BKE_utildefines.h

@@ -38,4 +38,4 @@ extern "C" {
 }
 #endif
 
-#endif // __BKE_UTILDEFINES_H__
+#endif  /* __BKE_UTILDEFINES_H__ */

source/blender/blenkernel/nla_private.h

@@ -85,4 +85,4 @@ NlaEvalStrip *nlastrips_ctime_get_strip(ListBase *list, ListBase *strips, short
 void nlastrip_evaluate(PointerRNA *ptr, ListBase *channels, ListBase *modifiers, NlaEvalStrip *nes);
 void nladata_flush_channels(ListBase *channels);
 
-#endif // __NLA_PRIVATE_H__
+#endif  /* __NLA_PRIVATE_H__ */

source/blender/blenlib/BLI_bpath.h

@@ -64,4 +64,4 @@ void BLI_bpath_missing_files_find(struct Main *bmain, const char *searchpath, st
 void BLI_bpath_relative_convert(struct Main *bmain, const char *basedir, struct ReportList *reports);
 void BLI_bpath_absolute_convert(struct Main *bmain, const char *basedir, struct ReportList *reports);
 
-#endif // __BLI_BPATH_H__
+#endif  /* __BLI_BPATH_H__ */

source/blender/blenlib/BLI_dlrbTree.h

@@ -158,4 +158,4 @@ void BLI_dlrbTree_insert(DLRBT_Tree *tree, DLRBT_Node *node);
 
 /* ********************************************** */
 
-#endif // __BLI_DLRBTREE_H__
+#endif  /* __BLI_DLRBTREE_H__ */

source/blender/blenlib/BLI_kdopbvh.h

@@ -113,5 +113,4 @@ int BLI_bvhtree_range_query(BVHTree *tree, const float co[3], float radius, BVHT
 }
 #endif
 
-#endif // __BLI_KDOPBVH_H__
-
+#endif  /* __BLI_KDOPBVH_H__ */

source/blender/blenlib/BLI_utildefines.h

@@ -330,4 +330,4 @@
 #  define UNLIKELY(x)     (x)
 #endif
 
-#endif // __BLI_UTILDEFINES_H__
+#endif  /* __BLI_UTILDEFINES_H__ */

source/blender/compositor/intern/COM_Node.h

@@ -20,8 +20,8 @@
  *		Monique Dewanchand
  */
 
-#ifndef _COM_Node_h
-#define _COM_Node_h
+#ifndef __COM_NODE_H__
+#define __COM_NODE_H__
 
 #include "COM_NodeBase.h"
 #include "COM_InputSocket.h"
@@ -152,4 +152,4 @@ protected:
 private:
 };
 
-#endif
+#endif  /* __COM_NODE_H__ */

source/blender/compositor/intern/COM_NodeBase.h

@@ -20,8 +20,8 @@
  *		Monique Dewanchand
  */
 
-#ifndef _COM_NodeBase_h
-#define _COM_NodeBase_h
+#ifndef __COM_NODEBASE_H__
+#define __COM_NODEBASE_H__
 
 #include "COM_InputSocket.h"
 #include "COM_OutputSocket.h"
@@ -166,4 +166,4 @@ protected:
 #endif
 };
 
-#endif
+#endif  /* __COM_NODEBASE_H__ */

source/blender/compositor/nodes/COM_ChannelMatteNode.h

@@ -34,4 +34,4 @@ public:
 	void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
 };
 
-#endif // COM_ChannelMatteNODE_H
+#endif  /* COM_ChannelMatteNODE_H */

source/blender/compositor/nodes/COM_ChromaMatteNode.h

@@ -34,4 +34,4 @@ public:
 	void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
 };
 
-#endif // COM_ChromaMatteNODE_H
+#endif  /* COM_ChromaMatteNODE_H */

source/blender/compositor/nodes/COM_ColorBalanceNode.h

@@ -35,4 +35,4 @@ public:
 	void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
 };
 
-#endif // COM_ColorBalanceNODE_H
+#endif  /* COM_ColorBalanceNODE_H */

source/blender/compositor/nodes/COM_ColorMatteNode.h

@@ -34,4 +34,4 @@ public:
 	void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
 };
 
-#endif // COM_ColorMatteNODE_H
+#endif  /* COM_ColorMatteNODE_H */

source/blender/compositor/nodes/COM_ColorRampNode.h

@@ -35,4 +35,4 @@ public:
 	void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
 };
 
-#endif // COM_ColorRampNODE_H
+#endif  /* COM_ColorRampNODE_H */

source/blender/compositor/nodes/COM_ColorSpillNode.h

@@ -35,4 +35,4 @@ public:
 	void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
 };
 
-#endif // COM_ColorSpillNODE_H
+#endif  /* COM_ColorSpillNODE_H */

source/blender/compositor/nodes/COM_DifferenceMatteNode.h

@@ -35,4 +35,4 @@ public:
 	void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
 };
 
-#endif // COM_DifferenceMatteNODE_H
+#endif  /* COM_DifferenceMatteNODE_H */

source/blender/compositor/nodes/COM_DistanceMatteNode.h

@@ -34,4 +34,4 @@ public:
 	void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
 };
 
-#endif // COM_DistanceMatteNODE_H
+#endif  /* COM_DistanceMatteNODE_H */

source/blender/compositor/nodes/COM_FilterNode.h

@@ -20,8 +20,8 @@
  *		Monique Dewanchand
  */
 
-#ifndef _COM_FilterNode_h_
-#define _COM_FilterNode_h_
+#ifndef __COM_FILTERNODE_H__
+#define __COM_FILTERNODE_H__
 
 #include "COM_Node.h"
 
@@ -35,4 +35,4 @@ public:
 	void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
 };
 
-#endif // _COM_FilterNode_h_
+#endif  /* __COM_FILTERNODE_H__ */

source/blender/compositor/nodes/COM_LuminanceMatteNode.h

@@ -19,8 +19,8 @@
  *		Dalai Felinto
  */
 
-#ifndef _COM_LuminanceMatteNode_h_
-#define _COM_LuminanceMatteNode_h_
+#ifndef __COM_LUMINANCEMATTENODE_H__
+#define __COM_LUMINANCEMATTENODE_H__
 
 #include "COM_Node.h"
 
@@ -34,4 +34,4 @@ public:
 	void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
 };
 
-#endif // _COM_LuminanceMatteNode_h_
+#endif  /* __COM_LUMINANCEMATTENODE_H__ */

source/blender/compositor/nodes/COM_MapValueNode.h

@@ -20,8 +20,8 @@
  *		Monique Dewanchand
  */
 
-#ifndef _COM_MapValueNode_h_
-#define _COM_MapValueNode_h_
+#ifndef __COM_MAPVALUENODE_H__
+#define __COM_MAPVALUENODE_H__
 
 #include "COM_Node.h"
 #include "DNA_node_types.h"
@@ -35,4 +35,4 @@ public:
 	void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
 };
 
-#endif // _COM_MapValueNode_h_
+#endif  /* __COM_MAPVALUENODE_H__ */

source/blender/compositor/nodes/COM_MaskNode.h

@@ -21,8 +21,8 @@
  *		Sergey Sharybin
  */
 
-#ifndef _COM_MaskNode_h_
-#define _COM_MaskNode_h_
+#ifndef __COM_MASKNODE_H__
+#define __COM_MASKNODE_H__
 
 #include "COM_Node.h"
 #include "DNA_node_types.h"
@@ -38,4 +38,4 @@ public:
 
 };
 
-#endif // _COM_MaskNode_h_
+#endif  /* __COM_MASKNODE_H__ */

source/blender/compositor/nodes/COM_MovieClipNode.h

@@ -20,8 +20,8 @@
  *		Monique Dewanchand
  */
 
-#ifndef _COM_MovieClipNode_h_
-#define _COM_MovieClipNode_h_
+#ifndef __COM_MOVIECLIPNODE_H__
+#define __COM_MOVIECLIPNODE_H__
 
 #include "COM_Node.h"
 #include "DNA_node_types.h"
@@ -36,4 +36,4 @@ public:
 	void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
 };
 
-#endif // _COM_MovieClipNode_h_
+#endif  /* __COM_MOVIECLIPNODE_H__ */

source/blender/compositor/nodes/COM_NormalNode.h

@@ -35,4 +35,4 @@ public:
 	void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
 };
 
-#endif // COM_NormalNODE_H
+#endif  /* COM_NormalNODE_H */

source/blender/compositor/nodes/COM_TransformNode.h

@@ -20,8 +20,8 @@
  *		Monique Dewanchand
  */
 
-#ifndef _COM_TransformNode_h_
-#define _COM_TransformNode_h_
+#ifndef __COM_TRANSFORMNODE_H__
+#define __COM_TRANSFORMNODE_H__
 
 #include "COM_Node.h"
 #include "DNA_node_types.h"
@@ -36,4 +36,4 @@ public:
 	void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
 };
 
-#endif // _COM_TransformNode_h_
+#endif  /* __COM_TRANSFORMNODE_H__ */

source/blender/editors/animation/anim_intern.h

@@ -82,4 +82,4 @@ void ANIM_OT_driver_button_remove(struct wmOperatorType *ot);
 void ANIM_OT_copy_driver_button(struct wmOperatorType *ot);
 void ANIM_OT_paste_driver_button(struct wmOperatorType *ot);
 
-#endif // __ANIM_INTERN_H__
+#endif  /* __ANIM_INTERN_H__ */

source/blender/editors/include/ED_keyframes_draw.h

@@ -157,4 +157,3 @@ short compare_ab_cfraPtr(void *node, void *data);
 short actkeyblock_is_valid(ActKeyBlock *ab, struct DLRBT_Tree *keys);
 
 #endif  /*  __ED_KEYFRAMES_DRAW_H__ */
-

source/blender/editors/mesh/mesh_intern.h

@@ -221,5 +221,4 @@ void MESH_OT_navmesh_face_add(struct wmOperatorType *ot);
 void MESH_OT_navmesh_reset(struct wmOperatorType *ot);
 void MESH_OT_navmesh_clear(struct wmOperatorType *ot);
 
-#endif // __MESH_INTERN_H__
-
+#endif  /* __MESH_INTERN_H__ */

source/blender/ikplugin/BIK_api.h

@@ -92,5 +92,4 @@ void BIK_test_constraint(struct Object *ob, struct bConstraint *cons);
 }
 #endif
 
-#endif // __BIK_API_H__
-
+#endif  /* __BIK_API_H__ */

source/blender/ikplugin/intern/ikplugin_api.h

@@ -60,5 +60,4 @@ typedef struct IKPlugin IKPlugin;
 }
 #endif
 
-#endif // __IKPLUGIN_API_H__
-
+#endif  /* __IKPLUGIN_API_H__ */

source/blender/ikplugin/intern/iksolver_plugin.h

@@ -47,5 +47,4 @@ void iksolver_execute_tree(struct Scene *scene, struct Object *ob,  struct bPose
 }
 #endif
 
-#endif // __IKSOLVER_PLUGIN_H__
-
+#endif  /* __IKSOLVER_PLUGIN_H__ */

source/blender/ikplugin/intern/itasc_plugin.h

@@ -52,5 +52,4 @@ void itasc_test_constraint(struct Object *ob, struct bConstraint *cons);
 }
 #endif
 
-#endif // __ITASC_PLUGIN_H__
-
+#endif  /* __ITASC_PLUGIN_H__ */

source/blender/imbuf/IMB_imbuf_types.h

@@ -242,7 +242,7 @@ typedef struct ImBuf {
 	((unsigned long)(unsigned char)(ch1) << 8) | \
 	((unsigned long)(unsigned char)(ch2) << 16) | \
 	((unsigned long)(unsigned char)(ch3) << 24))
-#endif //MAKEFOURCC
+#endif  /* MAKEFOURCC */
 
 /*
  * FOURCC codes for DX compressed-texture pixel formats
@@ -255,7 +255,7 @@ typedef struct ImBuf {
 #define FOURCC_DXT4  (MAKEFOURCC('D','X','T','4'))
 #define FOURCC_DXT5  (MAKEFOURCC('D','X','T','5'))
 
-#endif // DDS
+#endif  /* DDS */
 extern const char *imb_ext_image[];
 extern const char *imb_ext_image_qt[];
 extern const char *imb_ext_movie[];

source/blender/imbuf/intern/dds/BlockDXT.h

@@ -271,4 +271,4 @@ void mem_read(Stream & mem, BlockATI1 & block);
 void mem_read(Stream & mem, BlockATI2 & block);
 void mem_read(Stream & mem, BlockCTX1 & block);
 
-#endif // __BLOCKDXT_H__
+#endif  /* __BLOCKDXT_H__ */

source/blender/imbuf/intern/dds/Color.h

@@ -96,4 +96,4 @@ public:
 	};
 };
 
-#endif // __COLOR_H__
+#endif  /* __COLOR_H__ */

source/blender/imbuf/intern/dds/ColorBlock.h

@@ -104,4 +104,4 @@ inline Color32 & ColorBlock::color(uint x, uint y)
 	return m_color[y * 4 + x];
 }
 
-#endif // __COLORBLOCK_H__
+#endif  /* __COLORBLOCK_H__ */

source/blender/imbuf/intern/dds/DirectDrawSurface.h

@@ -200,4 +200,4 @@ void mem_read(Stream & mem, DDSCaps & caps);
 void mem_read(Stream & mem, DDSHeader & header);
 void mem_read(Stream & mem, DDSHeader10 & header);
 
-#endif // __DIRECTDRAWSURFACE_H__
+#endif  /* __DIRECTDRAWSURFACE_H__ */

source/blender/imbuf/intern/dds/Image.h

@@ -101,4 +101,4 @@ inline Color32 & Image::pixel(uint x, uint y)
 	return pixel(y * width() + x);
 }
 
-#endif // __IMAGE_H__
+#endif  /* __IMAGE_H__ */

source/blender/imbuf/intern/dds/PixelFormat.h

@@ -135,4 +135,4 @@
 
 	} // PixelFormat namespace
 
-#endif // _DDS_IMAGE_PIXELFORMAT_H
+#endif  /* __PIXELFORMAT_H__ */

source/blender/imbuf/intern/dds/Stream.h

@@ -45,5 +45,4 @@ unsigned int mem_read(Stream & mem, unsigned short & i);
 unsigned int mem_read(Stream & mem, unsigned char & i);
 unsigned int mem_read(Stream & mem, unsigned char *i, unsigned int cnt);
 
-#endif // __STREAM_H__
-
+#endif  /* __STREAM_H__ */

source/blender/makesdna/DNA_mask_types.h

@@ -211,4 +211,4 @@ enum {
 	MASK_ANIMF_EXPAND = (1 << 4)
 };
 
-#endif // __DNA_MASK_TYPES_H__
+#endif  /* __DNA_MASK_TYPES_H__ */

source/blender/modifiers/MOD_modifiertypes.h

@@ -79,4 +79,4 @@ extern ModifierTypeInfo modifierType_Skin;
 /* MOD_util.c */
 void modifier_type_init(ModifierTypeInfo *types[]);
 
-#endif //__MOD_MODIFIERTYPES_H__
+#endif  /* __MOD_MODIFIERTYPES_H__ */

source/blender/modifiers/intern/MOD_boolean_util.h

@@ -51,4 +51,4 @@ int NewBooleanMesh(struct Scene *scene, struct Base *base, struct Base *base_sel
 struct DerivedMesh *NewBooleanDerivedMesh(struct DerivedMesh *dm, struct Object *ob,
                                           struct DerivedMesh *dm_select, struct Object *ob_select, int int_op_type);
 
-#endif // MOD_BOOLEAN_UTILS
+#endif  /* MOD_BOOLEAN_UTILS */

source/blender/python/generic/py_capi_utils.h

@@ -69,4 +69,4 @@ int       PyC_FlagSet_ValueFromID(PyC_FlagSet *item, const char *identifier, int
 int       PyC_FlagSet_ToBitfield(PyC_FlagSet *items, PyObject *value, int *r_value, const char *error_prefix);
 PyObject *PyC_FlagSet_FromBitfield(PyC_FlagSet *items, int flag);
 
-#endif // __PY_CAPI_UTILS_H__
+#endif  /* __PY_CAPI_UTILS_H__ */

source/blender/python/intern/bpy_app.h

@@ -29,4 +29,4 @@
 
 PyObject *BPY_app_struct(void);
 
-#endif // __BPY_APP_H__
+#endif  /* __BPY_APP_H__ */

source/blender/python/intern/bpy_app_ffmpeg.h

@@ -29,4 +29,4 @@
 
 PyObject *BPY_app_ffmpeg_struct(void);
 
-#endif // __BPY_APP_FFMPEG_H__
+#endif  /* __BPY_APP_FFMPEG_H__ */

source/blender/python/intern/bpy_app_handlers.h

@@ -29,4 +29,4 @@
 
 PyObject *BPY_app_handlers_struct(void);
 
-#endif // __BPY_APP_HANDLERS_H__
+#endif /* __BPY_APP_HANDLERS_H__ */

source/blender/python/intern/bpy_driver.h

@@ -36,4 +36,4 @@ extern PyObject *bpy_pydriver_Dict;
 float BPY_driver_exec(struct ChannelDriver *driver, const float evaltime);
 void BPY_driver_reset(void);
 
-#endif // __BPY_DRIVER_H__
+#endif  /* __BPY_DRIVER_H__ */

source/blender/python/intern/bpy_traceback.h

@@ -28,4 +28,4 @@
 
 void python_script_error_jump(const char *filepath, int *lineno, int *offset);
 
-#endif // __BPY_TRACEBACK_H__
+#endif  /* __BPY_TRACEBACK_H__ */

source/blender/python/mathutils/mathutils_noise.h

@@ -33,4 +33,4 @@ PyMODINIT_FUNC PyInit_mathutils_noise(void);
 PyMODINIT_FUNC PyInit_mathutils_noise_types(void);
 PyMODINIT_FUNC PyInit_mathutils_noise_metrics(void);
 
-#endif // __MATHUTILS_NOISE_H__
+#endif /* __MATHUTILS_NOISE_H__ */

source/blender/quicktime/quicktime_export.h

@@ -164,6 +164,6 @@ enum {
 };
 #endif
 
-#endif //(_WIN32) || (__APPLE__)
+#endif /* (_WIN32) || (__APPLE__) */
 
-#endif  // __QUICKTIME_IMP_H__
+#endif  /* __QUICKTIME_IMP_H__ */

source/blender/quicktime/quicktime_import.h

@@ -51,8 +51,8 @@
 #import <Carbon/Carbon.h>
 #include <QuickTime/Movies.h>
 #endif
-#endif //__MOVIES__
-#endif //USE_QTKIT
+#endif  /* __MOVIES__ */
+#endif  /* USE_QTKIT */
 
 #ifdef _WIN32
 #ifndef __FIXMATH__
@@ -76,4 +76,4 @@ ImBuf  *qtime_fetchibuf (struct anim *anim, int position);
 int		imb_is_a_quicktime (char *name);
 ImBuf  *imb_quicktime_decode(unsigned char *mem, int size, int flags);
 
-#endif  // __QUICKTIME_IMPORT_H__
+#endif  /* __QUICKTIME_IMPORT_H__ */

source/blender/render/intern/raytrace/svbvh.h

@@ -29,12 +29,11 @@
  *  \ingroup render
  */
 
-
-#ifdef __SSE__
- 
 #ifndef __SVBVH_H__
 #define __SVBVH_H__
 
+#ifdef __SSE__
+
 #include "bvh.h"
 #include "BLI_memarena.h"
 #include "BKE_global.h"
@@ -311,7 +310,6 @@ struct Reorganize_SVBVH {
 	}	
 };
 
-#endif
-
-#endif //__SSE__
+#endif  /* __SSE__ */
 
+#endif  /* __SVBVH_H__ */

source/gameengine/BlenderRoutines/KX_BlenderCanvas.h

@@ -201,5 +201,4 @@ private:
 #endif
 };
 
-#endif // __KX_BLENDERCANVAS_H__
-
+#endif  /* __KX_BLENDERCANVAS_H__ */

source/gameengine/BlenderRoutines/KX_BlenderGL.h

@@ -34,7 +34,7 @@
 
 #ifdef __cplusplus
 extern "C" {
-#endif //__cplusplus
+#endif  /* __cplusplus */
 
 struct wmWindow;
 struct ARegion;
@@ -58,7 +58,6 @@ void BL_print_gamedebug_line_padded(const char* text, int xco, int yco, int widt
 
 #ifdef __cplusplus
 }
-#endif //__cplusplus
-
-#endif //__KX_BLENDERGL_H__
+#endif  /* __cplusplus */
 
+#endif  /* __KX_BLENDERGL_H__ */

source/gameengine/BlenderRoutines/KX_BlenderInputDevice.h

@@ -75,5 +75,5 @@ public:
 	MEM_CXX_CLASS_ALLOC_FUNCS("GE:BL_BlenderInputDevice")
 #endif
 };
-#endif //__KX_BLENDERINPUTDEVICE_H__
 
+#endif  /* __KX_BLENDERINPUTDEVICE_H__ */

source/gameengine/BlenderRoutines/KX_BlenderKeyboardDevice.h

@@ -59,5 +59,4 @@ private:
 #endif
 };
 
-#endif //__KX_BLENDERKEYBOARDDEVICE_H__
-
+#endif  /* __KX_BLENDERKEYBOARDDEVICE_H__ */

source/gameengine/BlenderRoutines/KX_BlenderMouseDevice.h

@@ -55,5 +55,4 @@ public:
 #endif
 };
 
-#endif //__KX_BLENDERMOUSEDEVICE_H__
-
+#endif  /* __KX_BLENDERMOUSEDEVICE_H__ */

source/gameengine/BlenderRoutines/KX_BlenderRenderTools.h

@@ -112,7 +112,4 @@ public:
 #endif
 };
 
-#endif //__KX_BLENDERRENDERTOOLS_H__
-
-
-
+#endif  /* __KX_BLENDERRENDERTOOLS_H__ */

source/gameengine/BlenderRoutines/KX_BlenderSystem.h

@@ -53,5 +53,4 @@ public:
 #endif
 };
 
-#endif //__KX_BLENDERSYSTEM_H__
-
+#endif  /* __KX_BLENDERSYSTEM_H__ */

source/gameengine/Converter/BL_ActionActuator.h

@@ -108,7 +108,7 @@ public:
 				return 1;
 		}
 	}
-#endif // WITH_PYTHON
+#endif  /* WITH_PYTHON */
 	
 protected:
 	MT_Point3	m_lastpos;

source/gameengine/Converter/BL_ArmatureActuator.h

@@ -77,7 +77,7 @@ public:
 	static PyObject *pyattr_get_object(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef);
 	static int pyattr_set_object(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef, PyObject *value);
 
-#endif // WITH_PYTHON
+#endif  /* WITH_PYTHON */
 
 private:
 	// identify the constraint that this actuator controls
@@ -93,6 +93,4 @@ private:
 	int				m_type;
 };
 
-#endif //__BL_ARMATUREACTUATOR_H__
-
-
+#endif  /* __BL_ARMATUREACTUATOR_H__ */

source/gameengine/Converter/BL_ArmatureChannel.h

@@ -68,7 +68,7 @@ public:
 	static int py_attr_setattr(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef, PyObject *value);
 	static PyObject *py_attr_get_joint_rotation(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef);
 	static int py_attr_set_joint_rotation(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef, PyObject *value);
-#endif // WITH_PYTHON
+#endif  /* WITH_PYTHON */
 };
 
 /* this is a factory class to access bBone data field in the GE.
@@ -93,6 +93,4 @@ public:
 
 };
 
-
-#endif //__BL_ARMATURECHANNEL_H__
-
+#endif  /* __BL_ARMATURECHANNEL_H__ */

source/gameengine/Converter/BL_ArmatureConstraint.h

@@ -119,8 +119,7 @@ public:
 
 	static PyObject *py_attr_getattr(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef);
 	static int py_attr_setattr(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef, PyObject *value);
-#endif // WITH_PYTHON
+#endif  /* WITH_PYTHON */
 };
 
-#endif //__BL_ARMATURECONSTRAINT_H__
-
+#endif  /* __BL_ARMATURECONSTRAINT_H__ */

source/gameengine/Converter/BL_ArmatureObject.h

@@ -120,7 +120,7 @@ public:
 	static PyObject *pyattr_get_channels(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef);
 	KX_PYMETHOD_DOC_NOARGS(BL_ArmatureObject, update);
 
-#endif // WITH_PYTHON
+#endif  /* WITH_PYTHON */
 
 protected:
 	/* list element: BL_ArmatureConstraint. Use SG_DListHead to have automatic list replication */
@@ -152,6 +152,4 @@ void game_blend_poses(struct bPose *dst, struct bPose *src, float srcweight/*, s
 void game_copy_pose(struct bPose **dst, struct bPose *src, int copy_con);
 void game_free_pose(struct bPose *pose);
 
-
-#endif
-
+#endif  /* __BL_ARMATUREOBJECT_H__ */

source/gameengine/Converter/BL_BlenderDataConversion.h

@@ -52,5 +52,4 @@ void BL_ConvertBlenderObjects(struct Main* maggie,
 
 SCA_IInputDevice::KX_EnumInputs ConvertKeyCode(int key_code);
 
-#endif // __BL_BLENDERDATACONVERSION_H__
-
+#endif  /* __BL_BLENDERDATACONVERSION_H__ */

source/gameengine/Converter/BL_DeformableGameObject.h

@@ -34,7 +34,7 @@
 
 #if defined(WIN32) && !defined(FREE_WINDOWS)
 #pragma warning (disable:4786) // get rid of stupid stl-visual compiler debug warning
-#endif //WIN32
+#endif  /* WIN32 */
 
 #include "DNA_mesh_types.h"
 #include "KX_GameObject.h"
@@ -104,5 +104,4 @@ protected:
 #endif
 };
 
-#endif
-
+#endif  /* __BL_DEFORMABLEGAMEOBJECT_H__ */

source/gameengine/Converter/BL_MeshDeformer.h

@@ -40,7 +40,7 @@
 
 #if defined(WIN32) && !defined(FREE_WINDOWS)
 #pragma warning (disable:4786) // get rid of stupid stl-visual compiler debug warning
-#endif //WIN32
+#endif  /* WIN32 */
 
 class BL_DeformableGameObject;
 

source/gameengine/Converter/BL_ModifierDeformer.h

@@ -34,7 +34,7 @@
 
 #if defined(WIN32) && !defined(FREE_WINDOWS)
 #pragma warning (disable:4786) // get rid of stupid stl-visual compiler debug warning
-#endif //WIN32
+#endif  /* WIN32 */
 
 #include "BL_ShapeDeformer.h"
 #include "BL_DeformableGameObject.h"
@@ -111,5 +111,4 @@ protected:
 #endif
 };
 
-#endif
-
+#endif  /* __BL_MODIFIERDEFORMER_H__ */

source/gameengine/Converter/BL_ShapeActionActuator.h

@@ -108,7 +108,7 @@ public:
 
 	}
 
-#endif // WITH_PYTHON
+#endif  /* WITH_PYTHON */
 
 protected:
 
@@ -141,5 +141,4 @@ protected:
 	struct PointerRNA *m_idptr;
 };
 
-#endif
-
+#endif  /* __BL_SHAPEACTIONACTUATOR_H__ */

source/gameengine/Converter/BL_ShapeDeformer.h

@@ -34,7 +34,7 @@
 
 #if defined(WIN32) && !defined(FREE_WINDOWS)
 #pragma warning (disable:4786) // get rid of stupid stl-visual compiler debug warning
-#endif //WIN32
+#endif  /* WIN32 */
 
 #include "BL_SkinDeformer.h"
 #include "BL_DeformableGameObject.h"

source/gameengine/Converter/BL_SkinDeformer.h

@@ -34,7 +34,7 @@
 
 #if defined(WIN32) && !defined(FREE_WINDOWS)
 #pragma warning (disable:4786) // get rid of stupid stl-visual compiler debug warning
-#endif //WIN32
+#endif  /* WIN32 */
 
 #include "CTR_HashedPtr.h"
 #include "BL_MeshDeformer.h"

source/gameengine/Converter/BlenderWorldInfo.h

@@ -104,5 +104,4 @@ public:
 #endif
 };
 
-#endif //__BLENDERWORLDINFO_H__
-
+#endif  /* __BLENDERWORLDINFO_H__ */

source/gameengine/Converter/KX_BlenderScalarInterpolator.h

@@ -73,5 +73,4 @@ public:
 #endif
 };
 
-#endif //__KX_BLENDERSCALARINTERPOLATOR_H__
-
+#endif  /* __KX_BLENDERSCALARINTERPOLATOR_H__ */

source/gameengine/Converter/KX_BlenderSceneConverter.h

@@ -196,5 +196,4 @@ public:
 #endif
 };
 
-#endif //__KX_BLENDERSCENECONVERTER_H__
-
+#endif  /* __KX_BLENDERSCENECONVERTER_H__ */

source/gameengine/Converter/KX_ConvertActuators.h

@@ -43,6 +43,4 @@ void BL_ConvertActuators(const char* maggiename,
 	 class RAS_IRenderTools* rendertools, 
 	 class KX_BlenderSceneConverter* converter);
 
-
-#endif //__KX_CONVERTACTUATORS_H__
-
+#endif  /* __KX_CONVERTACTUATORS_H__ */

source/gameengine/Converter/KX_ConvertControllers.h

@@ -43,6 +43,4 @@ void BL_ConvertControllers(
 	class KX_BlenderSceneConverter* converter
 );
 
-
-#endif //__KX_CONVERTCONTROLLERS_H__
-
+#endif  /* __KX_CONVERTCONTROLLERS_H__ */

source/gameengine/Converter/KX_ConvertProperties.h

@@ -38,5 +38,4 @@ void BL_ConvertProperties(struct Object* object,
                           class SCA_IScene* scene,
                           bool isInActiveLayer);
 
-#endif //__KX_CONVERTPROPERTIES_H__
-
+#endif  /* __KX_CONVERTPROPERTIES_H__ */

source/gameengine/Converter/KX_ConvertSensors.h

@@ -42,5 +42,4 @@ void BL_ConvertSensors(struct Object* blenderobject,
 	   class RAS_ICanvas* canvas, 
 	   class KX_BlenderSceneConverter* converter);
 
-#endif //__KX_CONVERTSENSORS_H__
-
+#endif  /* __KX_CONVERTSENSORS_H__ */

source/gameengine/Converter/KX_IpoConvert.h

@@ -66,5 +66,4 @@ void BL_ConvertMaterialIpos(struct Object* blenderobject,
 	class KX_BlenderSceneConverter *converter);
 
 
-#endif //__KX_IPOCONVERT_H__
-
+#endif  /* __KX_IPOCONVERT_H__ */

source/gameengine/Converter/KX_SoftBodyDeformer.h

@@ -34,7 +34,7 @@
 
 #if defined(WIN32) && !defined(FREE_WINDOWS)
 #pragma warning (disable:4786) // get rid of stupid stl-visual compiler debug warning
-#endif //WIN32
+#endif  /* WIN32 */
 
 #include "RAS_Deformer.h"
 #include "BL_DeformableGameObject.h"

source/gameengine/Expressions/BoolValue.h

@@ -61,5 +61,4 @@ private:
 #endif
 };
 
-#endif // !defined __BOOLVALUE_H__
-
+#endif  /* __BOOLVALUE_H__ */

source/gameengine/Expressions/ConstExpr.h

@@ -51,5 +51,4 @@ private:
 #endif
 };
 
-#endif // !defined(AFX_CONSTEXPR_H__061ECFC3_BE87_11D1_A51C_00A02472FC58__INCLUDED_)
-
+#endif  /* __CONSTEXPR_H__ */

source/gameengine/Expressions/EXP_C-Api.h

@@ -64,5 +64,4 @@ const char*					EXP_GetText(EXP_ValueHandle);
 }
 #endif
 
-#endif //__EXP_C_API_H__
-
+#endif  /* __EXP_C_API_H__ */

source/gameengine/Expressions/EmptyValue.h

@@ -45,5 +45,4 @@ public:
 #endif
 };
 
-#endif // !defined __EMPTYVALUE_H__
-
+#endif  /* __EMPTYVALUE_H__ */

source/gameengine/Expressions/ErrorValue.h

@@ -43,5 +43,4 @@ private:
 #endif
 };
 
-#endif // !defined __ERRORVALUE_H__
-
+#endif  /* __ERRORVALUE_H__ */

source/gameengine/Expressions/Expression.h

@@ -146,5 +146,4 @@ protected:
 #endif
 };
 
-#endif // !defined __EXPRESSION_H__
-
+#endif  /* __EXPRESSION_H__ */

source/gameengine/Expressions/FloatValue.h

@@ -54,5 +54,4 @@ protected:
 #endif
 };
 
-#endif // !defined __FLOATVALUE_H__
-
+#endif  /* __FLOATVALUE_H__ */

source/gameengine/Expressions/IdentifierExpr.h

@@ -56,5 +56,4 @@ public:
 #endif
 };
 
-#endif //__IDENTIFIEREXPR_H__
-
+#endif  /* __IDENTIFIEREXPR_H__ */

source/gameengine/Expressions/IfExpr.h

@@ -16,12 +16,8 @@
  *  \ingroup expressions
  */
 
-#if !defined(AFX_IFEXPR_H__1F691841_C5C7_11D1_A863_0000B4542BD8__INCLUDED_)
-#define AFX_IFEXPR_H__1F691841_C5C7_11D1_A863_0000B4542BD8__INCLUDED_
-
-#if defined(_MSC_VER) && _MSC_VER >= 1000
-#pragma once
-#endif // _MSC_VER >= 1000
+#ifndef __IFEXPR_H__
+#define __IFEXPR_H__
 
 #include "Expression.h"
 
@@ -55,5 +51,4 @@ public:
 #endif
 };
 
-#endif // !defined(AFX_IFEXPR_H__1F691841_C5C7_11D1_A863_0000B4542BD8__INCLUDED_)
-
+#endif  /* __IFEXPR_H__ */

source/gameengine/Expressions/IntValue.h

@@ -69,5 +69,4 @@ private:
 #endif
 };
 
-#endif // !defined __INTVALUE_H__
-
+#endif  /* __INTVALUE_H__ */

source/gameengine/Expressions/KX_HashedPtr.h

@@ -58,5 +58,4 @@ public:
 #endif
 };
 
-#endif //__KX_HASHEDPTR_H__
-
+#endif  /* __KX_HASHEDPTR_H__ */

source/gameengine/Expressions/KX_Python.h

@@ -79,5 +79,4 @@
 #undef toupper
 #endif
 
-#endif // __KX_PYTHON_H__
-
+#endif  /* __KX_PYTHON_H__ */

source/gameengine/Expressions/ListValue.h

@@ -87,5 +87,5 @@ private:
 	bool	m_bReleaseContents;
 };
 
-#endif // !defined __LISTVALUE_H__
+#endif  /* __LISTVALUE_H__ */
 

source/gameengine/Expressions/Operator1Expr.h

@@ -16,8 +16,8 @@
  *  \ingroup expressions
  */
 
-#if !defined(AFX_OPERATOR1EXPR_H__A1653901_BF41_11D1_A51C_00A02472FC58__INCLUDED_)
-#define AFX_OPERATOR1EXPR_H__A1653901_BF41_11D1_A51C_00A02472FC58__INCLUDED_
+#ifndef __OPERATOR1EXPR_H__
+#define __OPERATOR1EXPR_H__
 
 #include "Expression.h"
 
@@ -56,5 +56,4 @@ private:
 #endif
 };
 
-#endif // !defined(AFX_OPERATOR1EXPR_H__A1653901_BF41_11D1_A51C_00A02472FC58__INCLUDED_)
-
+#endif  /* __OPERATOR1EXPR_H__ */

source/gameengine/Expressions/Operator2Expr.h

@@ -62,5 +62,5 @@ private:
 #endif
 };
 
-#endif // !defined __OPERATOR2EXPR_H__
+#endif  /* __OPERATOR2EXPR_H__ */
 

source/gameengine/Expressions/PyObjectPlus.h

@@ -548,7 +548,7 @@ public: \
 #define Py_HeaderPtr \
 public: \
 
-#endif // WITH_CXX_GUARDEDALLOC
+#endif  /* WITH_CXX_GUARDEDALLOC */
 
 #endif
 
@@ -633,4 +633,4 @@ public:
 PyObject *PyUnicode_From_STR_String(const STR_String& str);
 #endif
 
-#endif //  __PYOBJECTPLUS_H__
+#endif  /* __PYOBJECTPLUS_H__ */

source/gameengine/Expressions/StringValue.h

@@ -45,7 +45,7 @@ public:
 	virtual PyObject*	ConvertValueToPython() {
 		return PyUnicode_From_STR_String(m_strString);
 	}
-#endif // WITH_PYTHON
+#endif  /* WITH_PYTHON */
 
 private:
 	// data member
@@ -57,5 +57,4 @@ private:
 #endif
 };
 
-#endif
-
+#endif  /* __STRINGVALUE_H__ */

source/gameengine/Expressions/Value.h

@@ -16,13 +16,13 @@
  *  \ingroup expressions
  */
 
-#if defined(WIN32) && !defined(FREE_WINDOWS)
-#pragma warning (disable:4786)
-#endif //WIN32
-
 #ifndef __VALUE_H__
 #define __VALUE_H__
 
+#if defined(WIN32) && !defined(FREE_WINDOWS)
+#pragma warning (disable:4786)
+#endif  /* WIN32 */
+
 #include <map>		// array functionality for the propertylist
 #include "STR_String.h"	// STR_String class
 
@@ -53,14 +53,6 @@ using namespace std;
 #define	assertd(exp)			((void)NULL)
 #endif
 
-
-#ifndef USE_PRAGMA_ONCE
-#ifdef WIN32
-	#pragma once
-
-#endif //WIN32
-#endif
-
 enum VALUE_OPERATOR {
 	
 	VALUE_MOD_OPERATOR,			// %
@@ -233,7 +225,7 @@ public:
 	static PyObject *pyattr_get_name(void * self, const KX_PYATTRIBUTE_DEF * attrdef);
 	
 	virtual PyObject *ConvertKeysToPython( void );
-#endif // WITH_PYTHON
+#endif  /* WITH_PYTHON */
 
 	
 	
@@ -439,5 +431,4 @@ protected:
 #endif
 };
 
-#endif // !defined _VALUEBASECLASS_H
-
+#endif  /* __VALUE_H__ */