diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-02-17 22:59:41 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-02-17 22:59:41 +0400 |
| commit | 2b7ca2304a9b17568fac57a0bceba72b9c9ab580 (patch) | |
| tree | 0cb3492a7d6624bca9390375a5b20bd5b86f76d5 /source/blender | |
| parent | 99d0ba6299d9f2acdf2446b2f52e812877ebcc70 (diff) | |
unify include guard defines, __$FILENAME__
without the underscores these clogged up the namespace for autocompleation which was annoying.
Diffstat (limited to 'source/blender')
434 files changed, 1076 insertions, 1075 deletions
diff --git a/source/blender/avi/AVI_avi.h b/source/blender/avi/AVI_avi.h index ea073f79a7e..00c6863f75c 100644 --- a/source/blender/avi/AVI_avi.h +++ b/source/blender/avi/AVI_avi.h @@ -50,8 +50,8 @@ * */ -#ifndef __AVI_H__ -#define __AVI_H__ +#ifndef __AVI_AVI_H__ +#define __AVI_AVI_H__ #include "MEM_sys_types.h" #include <stdio.h> /* for FILE */ @@ -305,5 +305,5 @@ AviError AVI_write_frame (AviMovie *movie, int frame_num, ...); AviError AVI_print_error (AviError error); void AVI_set_debug (int mode); -#endif /* __AVI_H__ */ +#endif /* __AVI_AVI_H__ */ diff --git a/source/blender/avi/intern/avi_intern.h b/source/blender/avi/intern/avi_intern.h index 15307956756..c8d54fe99e9 100644 --- a/source/blender/avi/intern/avi_intern.h +++ b/source/blender/avi/intern/avi_intern.h @@ -29,8 +29,8 @@ * \ingroup avi */ -#ifndef AVI_INTERN_H -#define AVI_INTERN_H +#ifndef __AVI_INTERN_H__ +#define __AVI_INTERN_H__ #include <stdio.h> /* for FILE */ diff --git a/source/blender/avi/intern/endian.h b/source/blender/avi/intern/endian.h index 7a443fae8df..3229f32cbbd 100644 --- a/source/blender/avi/intern/endian.h +++ b/source/blender/avi/intern/endian.h @@ -34,8 +34,8 @@ */ -#ifndef AVI_ENDIAN_H -#define AVI_ENDIAN_H +#ifndef __ENDIAN_H__ +#define __ENDIAN_H__ #include <stdio.h> #include "AVI_avi.h" diff --git a/source/blender/blenfont/BLF_api.h b/source/blender/blenfont/BLF_api.h index a045f47cb40..d7b441e70e1 100644 --- a/source/blender/blenfont/BLF_api.h +++ b/source/blender/blenfont/BLF_api.h @@ -29,8 +29,8 @@ */ -#ifndef BLF_API_H -#define BLF_API_H +#ifndef __BLF_API_H__ +#define __BLF_API_H__ struct rctf; @@ -204,4 +204,4 @@ void BLF_dir_free(char **dirs, int count); extern int blf_mono_font; extern int blf_mono_font_render; // dont mess drawing with render threads. -#endif /* BLF_API_H */ +#endif /* __BLF_API_H__ */ diff --git a/source/blender/blenfont/BLF_translation.h b/source/blender/blenfont/BLF_translation.h index ce53b76da01..3bb6c37e345 100644 --- a/source/blender/blenfont/BLF_translation.h +++ b/source/blender/blenfont/BLF_translation.h @@ -30,8 +30,8 @@ */ -#ifndef BLF_TRANSLATION_H -#define BLF_TRANSLATION_H +#ifndef __BLF_TRANSLATION_H__ +#define __BLF_TRANSLATION_H__ #define TEXT_DOMAIN_NAME "blender" @@ -75,4 +75,4 @@ const char *BLF_translate_do_tooltip(const char *msgid); #define IFACE_(msgid) BLF_translate_do_iface(msgid) #define TIP_(msgid) BLF_translate_do_tooltip(msgid) -#endif /* BLF_TRANSLATION_H */ +#endif /* __BLF_TRANSLATION_H__ */ diff --git a/source/blender/blenfont/intern/blf_internal.h b/source/blender/blenfont/intern/blf_internal.h index 20124666bcc..3ef0b3422fe 100644 --- a/source/blender/blenfont/intern/blf_internal.h +++ b/source/blender/blenfont/intern/blf_internal.h @@ -28,8 +28,8 @@ */ -#ifndef BLF_INTERNAL_H -#define BLF_INTERNAL_H +#ifndef __BLF_INTERNAL_H__ +#define __BLF_INTERNAL_H__ struct FontBLF; struct GlyphBLF; @@ -72,4 +72,4 @@ struct GlyphBLF *blf_glyph_add(struct FontBLF *font, unsigned int index, unsigne void blf_glyph_free(struct GlyphBLF *g); int blf_glyph_render(struct FontBLF *font, struct GlyphBLF *g, float x, float y); -#endif /* BLF_INTERNAL_H */ +#endif /* __BLF_INTERNAL_H__ */ diff --git a/source/blender/blenfont/intern/blf_internal_types.h b/source/blender/blenfont/intern/blf_internal_types.h index e8021aad6d1..cbe7975fdd6 100644 --- a/source/blender/blenfont/intern/blf_internal_types.h +++ b/source/blender/blenfont/intern/blf_internal_types.h @@ -28,8 +28,8 @@ */ -#ifndef BLF_INTERNAL_TYPES_H -#define BLF_INTERNAL_TYPES_H +#ifndef __BLF_INTERNAL_TYPES_H__ +#define __BLF_INTERNAL_TYPES_H__ typedef struct GlyphCacheBLF { struct GlyphCacheBLF *next; @@ -223,4 +223,4 @@ typedef struct DirBLF { char *path; } DirBLF; -#endif /* BLF_INTERNAL_TYPES_H */ +#endif /* __BLF_INTERNAL_TYPES_H__ */ diff --git a/source/blender/blenkernel/BKE_DerivedMesh.h b/source/blender/blenkernel/BKE_DerivedMesh.h index a887412bbf4..40e2a4082f6 100644 --- a/source/blender/blenkernel/BKE_DerivedMesh.h +++ b/source/blender/blenkernel/BKE_DerivedMesh.h @@ -25,8 +25,8 @@ * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BKE_DERIVEDMESH_H -#define BKE_DERIVEDMESH_H +#ifndef __BKE_DERIVEDMESH_H__ +#define __BKE_DERIVEDMESH_H__ /** \file BKE_DerivedMesh.h * \ingroup bke diff --git a/source/blender/blenkernel/BKE_action.h b/source/blender/blenkernel/BKE_action.h index 67efb7752ea..564cd235869 100644 --- a/source/blender/blenkernel/BKE_action.h +++ b/source/blender/blenkernel/BKE_action.h @@ -24,8 +24,8 @@ * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BKE_ACTION_H -#define BKE_ACTION_H +#ifndef __BKE_ACTION_H__ +#define __BKE_ACTION_H__ /** \file BKE_action.h * \ingroup bke * \brief Blender kernel action and pose functionality. diff --git a/source/blender/blenkernel/BKE_anim.h b/source/blender/blenkernel/BKE_anim.h index a55955c4d04..d605776ed50 100644 --- a/source/blender/blenkernel/BKE_anim.h +++ b/source/blender/blenkernel/BKE_anim.h @@ -24,8 +24,8 @@ * * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BKE_ANIM_H -#define BKE_ANIM_H +#ifndef __BKE_ANIM_H__ +#define __BKE_ANIM_H__ /** \file BKE_anim.h * \ingroup bke diff --git a/source/blender/blenkernel/BKE_animsys.h b/source/blender/blenkernel/BKE_animsys.h index 8e5b313b919..fb4a44b2c80 100644 --- a/source/blender/blenkernel/BKE_animsys.h +++ b/source/blender/blenkernel/BKE_animsys.h @@ -23,8 +23,8 @@ * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BKE_ANIM_SYS_H -#define BKE_ANIM_SYS_H +#ifndef __BKE_ANIMSYS_H__ +#define __BKE_ANIMSYS_H__ /** \file BKE_animsys.h * \ingroup bke @@ -160,4 +160,4 @@ void animsys_evaluate_action_group(struct PointerRNA *ptr, struct bAction *act, /* ************************************* */ -#endif /* BKE_ANIM_SYS_H*/ +#endif /* __BKE_ANIMSYS_H__*/ diff --git a/source/blender/blenkernel/BKE_armature.h b/source/blender/blenkernel/BKE_armature.h index 07d8d69f44e..b09122d022b 100644 --- a/source/blender/blenkernel/BKE_armature.h +++ b/source/blender/blenkernel/BKE_armature.h @@ -24,8 +24,8 @@ * * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BKE_ARMATURE_H -#define BKE_ARMATURE_H +#ifndef __BKE_ARMATURE_H__ +#define __BKE_ARMATURE_H__ /** \file BKE_armature.h * \ingroup bke diff --git a/source/blender/blenkernel/BKE_blender.h b/source/blender/blenkernel/BKE_blender.h index f735af8b24c..1c661b3804f 100644 --- a/source/blender/blenkernel/BKE_blender.h +++ b/source/blender/blenkernel/BKE_blender.h @@ -24,8 +24,8 @@ * * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BKE_BLENDER_H -#define BKE_BLENDER_H +#ifndef __BKE_BLENDER_H__ +#define __BKE_BLENDER_H__ /** \file BKE_blender.h * \ingroup bke diff --git a/source/blender/blenkernel/BKE_bmesh.h b/source/blender/blenkernel/BKE_bmesh.h index c8df6c4f455..51fb0da61fa 100644 --- a/source/blender/blenkernel/BKE_bmesh.h +++ b/source/blender/blenkernel/BKE_bmesh.h @@ -25,8 +25,8 @@ * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BKE_BMESH_H -#define BKE_BMESH_H +#ifndef __BKE_BMESH_H__ +#define __BKE_BMESH_H__ /** \file BKE_bmesh.h * \ingroup bke diff --git a/source/blender/blenkernel/BKE_bmeshCustomData.h b/source/blender/blenkernel/BKE_bmeshCustomData.h index 793410371df..bbdc6f39cff 100644 --- a/source/blender/blenkernel/BKE_bmeshCustomData.h +++ b/source/blender/blenkernel/BKE_bmeshCustomData.h @@ -26,8 +26,8 @@ */ -#ifndef BKE_BMESHCUSTOMDATA_H -#define BKE_BMESHCUSTOMDATA_H +#ifndef __BKE_BMESHCUSTOMDATA_H__ +#define __BKE_BMESHCUSTOMDATA_H__ /** \file BKE_bmeshCustomData.h * \ingroup bke diff --git a/source/blender/blenkernel/BKE_bmfont.h b/source/blender/blenkernel/BKE_bmfont.h index 71fd2ae3d67..6c0cbe3a51b 100644 --- a/source/blender/blenkernel/BKE_bmfont.h +++ b/source/blender/blenkernel/BKE_bmfont.h @@ -24,8 +24,8 @@ * * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BKE_BMFONT_H -#define BKE_BMFONT_H +#ifndef __BKE_BMFONT_H__ +#define __BKE_BMFONT_H__ /** \file BKE_bmfont.h * \ingroup bke diff --git a/source/blender/blenkernel/BKE_bmfont_types.h b/source/blender/blenkernel/BKE_bmfont_types.h index a4d37069cab..73ef0c3a2c3 100644 --- a/source/blender/blenkernel/BKE_bmfont_types.h +++ b/source/blender/blenkernel/BKE_bmfont_types.h @@ -24,8 +24,8 @@ * * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BKE_BMFONT_TYPES_H -#define BKE_BMFONT_TYPES_H +#ifndef __BKE_BMFONT_TYPES_H__ +#define __BKE_BMFONT_TYPES_H__ /** \file BKE_bmfont_types.h * \ingroup bke diff --git a/source/blender/blenkernel/BKE_boids.h b/source/blender/blenkernel/BKE_boids.h index 18e8be1512e..bb724c6632e 100644 --- a/source/blender/blenkernel/BKE_boids.h +++ b/source/blender/blenkernel/BKE_boids.h @@ -25,8 +25,8 @@ * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BKE_BOIDS_H -#define BKE_BOIDS_H +#ifndef __BKE_BOIDS_H__ +#define __BKE_BOIDS_H__ /** \file BKE_boids.h * \ingroup bke diff --git a/source/blender/blenkernel/BKE_booleanops_mesh.h b/source/blender/blenkernel/BKE_booleanops_mesh.h index 4c4a2dc9998..2e48b664449 100644 --- a/source/blender/blenkernel/BKE_booleanops_mesh.h +++ b/source/blender/blenkernel/BKE_booleanops_mesh.h @@ -24,8 +24,8 @@ * * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BKE_BOOLEANOPS_MESH_H -#define BKE_BOOLEANOPS_MESH_H +#ifndef __BKE_BOOLEANOPS_MESH_H__ +#define __BKE_BOOLEANOPS_MESH_H__ /** \file BKE_booleanops_mesh.h * \ingroup bke diff --git a/source/blender/blenkernel/BKE_brush.h b/source/blender/blenkernel/BKE_brush.h index 13f72634bda..f5cd2635ff7 100644 --- a/source/blender/blenkernel/BKE_brush.h +++ b/source/blender/blenkernel/BKE_brush.h @@ -26,8 +26,8 @@ * General operations for brushes. */ -#ifndef BKE_BRUSH_H -#define BKE_BRUSH_H +#ifndef __BKE_BRUSH_H__ +#define __BKE_BRUSH_H__ /** \file BKE_brush.h * \ingroup bke diff --git a/source/blender/blenkernel/BKE_bullet.h b/source/blender/blenkernel/BKE_bullet.h index 5eb653f69d1..2103eea1041 100644 --- a/source/blender/blenkernel/BKE_bullet.h +++ b/source/blender/blenkernel/BKE_bullet.h @@ -24,8 +24,8 @@ * * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BKE_BULLET_H -#define BKE_BULLET_H +#ifndef __BKE_BULLET_H__ +#define __BKE_BULLET_H__ /** \file BKE_bullet.h * \ingroup bke diff --git a/source/blender/blenkernel/BKE_bvhutils.h b/source/blender/blenkernel/BKE_bvhutils.h index 07f0c2fef7c..d3d8546ddae 100644 --- a/source/blender/blenkernel/BKE_bvhutils.h +++ b/source/blender/blenkernel/BKE_bvhutils.h @@ -24,8 +24,8 @@ * * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BKE_BVHUTILS_H -#define BKE_BVHUTILS_H +#ifndef __BKE_BVHUTILS_H__ +#define __BKE_BVHUTILS_H__ /** \file BKE_bvhutils.h * \ingroup bke diff --git a/source/blender/blenkernel/BKE_camera.h b/source/blender/blenkernel/BKE_camera.h index 72e22dc1583..6d10219e74c 100644 --- a/source/blender/blenkernel/BKE_camera.h +++ b/source/blender/blenkernel/BKE_camera.h @@ -25,8 +25,8 @@ * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BKE_CAMERA_H -#define BKE_CAMERA_H +#ifndef __BKE_CAMERA_H__ +#define __BKE_CAMERA_H__ /** \file BKE_camera.h * \ingroup bke diff --git a/source/blender/blenkernel/BKE_cdderivedmesh.h b/source/blender/blenkernel/BKE_cdderivedmesh.h index c71c86e110d..9b274a8a411 100644 --- a/source/blender/blenkernel/BKE_cdderivedmesh.h +++ b/source/blender/blenkernel/BKE_cdderivedmesh.h @@ -32,8 +32,8 @@ * mesh elements (vertices, edges and faces) as layers of custom element data. */ -#ifndef BKE_CDDERIVEDMESH_H -#define BKE_CDDERIVEDMESH_H +#ifndef __BKE_CDDERIVEDMESH_H__ +#define __BKE_CDDERIVEDMESH_H__ #include "BKE_DerivedMesh.h" diff --git a/source/blender/blenkernel/BKE_cloth.h b/source/blender/blenkernel/BKE_cloth.h index 6d42b8dc80b..ec20e3234a3 100644 --- a/source/blender/blenkernel/BKE_cloth.h +++ b/source/blender/blenkernel/BKE_cloth.h @@ -24,8 +24,8 @@ * * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BKE_CLOTH_H -#define BKE_CLOTH_H +#ifndef __BKE_CLOTH_H__ +#define __BKE_CLOTH_H__ /** \file BKE_cloth.h * \ingroup bke diff --git a/source/blender/blenkernel/BKE_collision.h b/source/blender/blenkernel/BKE_collision.h index acb3ae03816..453c16bb8c8 100644 --- a/source/blender/blenkernel/BKE_collision.h +++ b/source/blender/blenkernel/BKE_collision.h @@ -24,8 +24,8 @@ * * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BKE_COLLISIONS_H -#define BKE_COLLISIONS_H +#ifndef __BKE_COLLISION_H__ +#define __BKE_COLLISION_H__ /** \file BKE_collision.h * \ingroup bke diff --git a/source/blender/blenkernel/BKE_colortools.h b/source/blender/blenkernel/BKE_colortools.h index b358209a0f4..1da0caf97c2 100644 --- a/source/blender/blenkernel/BKE_colortools.h +++ b/source/blender/blenkernel/BKE_colortools.h @@ -24,8 +24,8 @@ * * ***** END GPL/BL DUAL LICENSE BLOCK ***** */ -#ifndef BKE_COLORTOOLS_H -#define BKE_COLORTOOLS_H +#ifndef __BKE_COLORTOOLS_H__ +#define __BKE_COLORTOOLS_H__ /** \file BKE_colortools.h * \ingroup bke diff --git a/source/blender/blenkernel/BKE_constraint.h b/source/blender/blenkernel/BKE_constraint.h index 925d1180dbd..f834ad5e774 100644 --- a/source/blender/blenkernel/BKE_constraint.h +++ b/source/blender/blenkernel/BKE_constraint.h @@ -25,8 +25,8 @@ * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BKE_CONSTRAINT_H -#define BKE_CONSTRAINT_H +#ifndef __BKE_CONSTRAINT_H__ +#define __BKE_CONSTRAINT_H__ /** \file BKE_constraint.h * \ingroup bke diff --git a/source/blender/blenkernel/BKE_context.h b/source/blender/blenkernel/BKE_context.h index 0aefe2231a5..78354cd4713 100644 --- a/source/blender/blenkernel/BKE_context.h +++ b/source/blender/blenkernel/BKE_context.h @@ -23,8 +23,8 @@ * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BKE_CONTEXT_H -#define BKE_CONTEXT_H +#ifndef __BKE_CONTEXT_H__ +#define __BKE_CONTEXT_H__ /** \file BKE_context.h * \ingroup bke diff --git a/source/blender/blenkernel/BKE_curve.h b/source/blender/blenkernel/BKE_curve.h index f0704741ebb..dd0c021f281 100644 --- a/source/blender/blenkernel/BKE_curve.h +++ b/source/blender/blenkernel/BKE_curve.h @@ -24,8 +24,8 @@ * * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BKE_CURVE_H -#define BKE_CURVE_H +#ifndef __BKE_CURVE_H__ +#define __BKE_CURVE_H__ /** \file BKE_curve.h * \ingroup bke diff --git a/source/blender/blenkernel/BKE_customdata.h b/source/blender/blenkernel/BKE_customdata.h index 7ad25ac7e79..764088da47b 100644 --- a/source/blender/blenkernel/BKE_customdata.h +++ b/source/blender/blenkernel/BKE_customdata.h @@ -31,8 +31,8 @@ * \brief CustomData interface, see also DNA_customdata_types.h. */ -#ifndef BKE_CUSTOMDATA_H -#define BKE_CUSTOMDATA_H +#ifndef __BKE_CUSTOMDATA_H__ +#define __BKE_CUSTOMDATA_H__ #ifdef __cplusplus extern "C" { diff --git a/source/blender/blenkernel/BKE_customdata_file.h b/source/blender/blenkernel/BKE_customdata_file.h index be7aaa70188..c4c41c20d80 100644 --- a/source/blender/blenkernel/BKE_customdata_file.h +++ b/source/blender/blenkernel/BKE_customdata_file.h @@ -18,8 +18,8 @@ * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BKE_CUSTOMDATA_FILE_H -#define BKE_CUSTOMDATA_FILE_H +#ifndef __BKE_CUSTOMDATA_FILE_H__ +#define __BKE_CUSTOMDATA_FILE_H__ /** \file BKE_customdata_file.h * \ingroup bke @@ -57,5 +57,5 @@ void cdf_remove(const char *filename); CDataFileLayer *cdf_layer_find(CDataFile *cdf, int type, const char *name); CDataFileLayer *cdf_layer_add(CDataFile *cdf, int type, const char *name, size_t datasize); -#endif /* BKE_CUSTOMDATA_FILE_H */ +#endif /* __BKE_CUSTOMDATA_FILE_H__ */ diff --git a/source/blender/blenkernel/BKE_deform.h b/source/blender/blenkernel/BKE_deform.h index 11747899aa9..2e9c94a3bb1 100644 --- a/source/blender/blenkernel/BKE_deform.h +++ b/source/blender/blenkernel/BKE_deform.h @@ -25,8 +25,8 @@ * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BKE_DEFORM_H -#define BKE_DEFORM_H +#ifndef __BKE_DEFORM_H__ +#define __BKE_DEFORM_H__ /** \file BKE_deform.h * \ingroup bke diff --git a/source/blender/blenkernel/BKE_depsgraph.h b/source/blender/blenkernel/BKE_depsgraph.h index 5d475903feb..1bc85a64c77 100644 --- a/source/blender/blenkernel/BKE_depsgraph.h +++ b/source/blender/blenkernel/BKE_depsgraph.h @@ -23,8 +23,8 @@ * ***** END GPL LICENSE BLOCK ***** */ -#ifndef DEPSGRAPH_API -#define DEPSGRAPH_API +#ifndef __BKE_DEPSGRAPH_H__ +#define __BKE_DEPSGRAPH_H__ /** \file BKE_depsgraph.h * \ingroup bke diff --git a/source/blender/blenkernel/BKE_displist.h b/source/blender/blenkernel/BKE_displist.h index 2d863201767..f43ec749a69 100644 --- a/source/blender/blenkernel/BKE_displist.h +++ b/source/blender/blenkernel/BKE_displist.h @@ -27,8 +27,8 @@ */ -#ifndef BKE_DISPLIST_H -#define BKE_DISPLIST_H +#ifndef __BKE_DISPLIST_H__ +#define __BKE_DISPLIST_H__ /** \file BKE_displist.h * \ingroup bke diff --git a/source/blender/blenkernel/BKE_dynamicpaint.h b/source/blender/blenkernel/BKE_dynamicpaint.h index 75b3c5b4f24..b6de8188536 100644 --- a/source/blender/blenkernel/BKE_dynamicpaint.h +++ b/source/blender/blenkernel/BKE_dynamicpaint.h @@ -11,8 +11,8 @@ * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BKE_DYNAMIC_PAINT_H_ -#define BKE_DYNAMIC_PAINT_H_ +#ifndef __BKE_DYNAMICPAINT_H__ +#define __BKE_DYNAMICPAINT_H__ struct bContext; struct wmOperator; @@ -88,4 +88,4 @@ void dynamicPaint_outputSurfaceImage(struct DynamicPaintSurface *surface, char* #define DPAINT_WAVE_OBSTACLE 1 #define DPAINT_WAVE_REFLECT_ONLY 2 -#endif /* BKE_DYNAMIC_PAINT_H_ */ +#endif /* __BKE_DYNAMICPAINT_H__ */ diff --git a/source/blender/blenkernel/BKE_effect.h b/source/blender/blenkernel/BKE_effect.h index 3ebd57dde39..c2706ddb5c0 100644 --- a/source/blender/blenkernel/BKE_effect.h +++ b/source/blender/blenkernel/BKE_effect.h @@ -24,8 +24,8 @@ * * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BKE_EFFECT_H -#define BKE_EFFECT_H +#ifndef __BKE_EFFECT_H__ +#define __BKE_EFFECT_H__ /** \file BKE_effect.h * \ingroup bke diff --git a/source/blender/blenkernel/BKE_fcurve.h b/source/blender/blenkernel/BKE_fcurve.h index 27e9140ba77..d79d6a204b9 100644 --- a/source/blender/blenkernel/BKE_fcurve.h +++ b/source/blender/blenkernel/BKE_fcurve.h @@ -23,8 +23,8 @@ * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BKE_FCURVE_H -#define BKE_FCURVE_H +#ifndef __BKE_FCURVE_H__ +#define __BKE_FCURVE_H__ /** \file BKE_fcurve.h * \ingroup bke @@ -270,4 +270,4 @@ void fcurve_store_samples(struct FCurve *fcu, void *data, int start, int end, Fc } #endif -#endif /* BKE_FCURVE_H*/ +#endif /* __BKE_FCURVE_H__*/ diff --git a/source/blender/blenkernel/BKE_fluidsim.h b/source/blender/blenkernel/BKE_fluidsim.h index 2b2c7a4ff87..c2b1b1d6cad 100644 --- a/source/blender/blenkernel/BKE_fluidsim.h +++ b/source/blender/blenkernel/BKE_fluidsim.h @@ -25,8 +25,8 @@ * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BKE_FLUIDSIM_H -#define BKE_FLUIDSIM_H +#ifndef __BKE_FLUIDSIM_H__ +#define __BKE_FLUIDSIM_H__ /** \file BKE_fluidsim.h * \ingroup bke diff --git a/source/blender/blenkernel/BKE_font.h b/source/blender/blenkernel/BKE_font.h index e164294b9a2..e94787cfd3c 100644 --- a/source/blender/blenkernel/BKE_font.h +++ b/source/blender/blenkernel/BKE_font.h @@ -24,8 +24,8 @@ * * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BKE_VFONT_H -#define BKE_VFONT_H +#ifndef __BKE_FONT_H__ +#define __BKE_FONT_H__ /** \file BKE_font.h * \ingroup bke diff --git a/source/blender/blenkernel/BKE_global.h b/source/blender/blenkernel/BKE_global.h index ee3edbb47e7..fab42b5667b 100644 --- a/source/blender/blenkernel/BKE_global.h +++ b/source/blender/blenkernel/BKE_global.h @@ -24,8 +24,8 @@ * * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BKE_GLOBAL_H -#define BKE_GLOBAL_H +#ifndef __BKE_GLOBAL_H__ +#define __BKE_GLOBAL_H__ /** \file BKE_global.h * \ingroup bke diff --git a/source/blender/blenkernel/BKE_gpencil.h b/source/blender/blenkernel/BKE_gpencil.h index dbb1107c228..bb0216fe11c 100644 --- a/source/blender/blenkernel/BKE_gpencil.h +++ b/source/blender/blenkernel/BKE_gpencil.h @@ -23,8 +23,8 @@ * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BKE_GPENCIL_H -#define BKE_GPENCIL_H +#ifndef __BKE_GPENCIL_H__ +#define __BKE_GPENCIL_H__ /** \file BKE_gpencil.h * \ingroup bke @@ -63,4 +63,4 @@ struct bGPDlayer *gpencil_layer_getactive(struct bGPdata *gpd); void gpencil_layer_setactive(struct bGPdata *gpd, struct bGPDlayer *active); void gpencil_layer_delactive(struct bGPdata *gpd); -#endif /* BKE_GPENCIL_H */ +#endif /* __BKE_GPENCIL_H__ */ diff --git a/source/blender/blenkernel/BKE_group.h b/source/blender/blenkernel/BKE_group.h index 044a40658c3..6629f0bdf7f 100644 --- a/source/blender/blenkernel/BKE_group.h +++ b/source/blender/blenkernel/BKE_group.h @@ -24,8 +24,8 @@ * * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BKE_GROUP_H -#define BKE_GROUP_H +#ifndef __BKE_GROUP_H__ +#define __BKE_GROUP_H__ /** \file BKE_group.h * \ingroup bke diff --git a/source/blender/blenkernel/BKE_icons.h b/source/blender/blenkernel/BKE_icons.h index ee18a41dbfe..85f259c3d94 100644 --- a/source/blender/blenkernel/BKE_icons.h +++ b/source/blender/blenkernel/BKE_icons.h @@ -25,8 +25,8 @@ * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BKE_ICONS_H -#define BKE_ICONS_H +#ifndef __BKE_ICONS_H__ +#define __BKE_ICONS_H__ /** \file BKE_icons.h * \ingroup bke @@ -90,4 +90,4 @@ struct PreviewImage* BKE_previewimg_copy(struct PreviewImage *prv); /* retrieve existing or create new preview image */ struct PreviewImage* BKE_previewimg_get(struct ID *id); -#endif /* BKE_ICONS_H */ +#endif /* __BKE_ICONS_H__ */ diff --git a/source/blender/blenkernel/BKE_idcode.h b/source/blender/blenkernel/BKE_idcode.h index 57855a7082f..2188bed1bf7 100644 --- a/source/blender/blenkernel/BKE_idcode.h +++ b/source/blender/blenkernel/BKE_idcode.h @@ -25,8 +25,8 @@ * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BKE_ID_INFO_H -#define BKE_ID_INFO_H +#ifndef __BKE_IDCODE_H__ +#define __BKE_IDCODE_H__ /** \file BKE_idcode.h * \ingroup bke diff --git a/source/blender/blenkernel/BKE_idprop.h b/source/blender/blenkernel/BKE_idprop.h index fbe5bf2ef44..5a661f7c731 100644 --- a/source/blender/blenkernel/BKE_idprop.h +++ b/source/blender/blenkernel/BKE_idprop.h @@ -23,8 +23,8 @@ * ***** END GPL LICENSE BLOCK ***** */ -#ifndef _BKE_IDPROP_H -#define _BKE_IDPROP_H +#ifndef __BKE_IDPROP_H__ +#define __BKE_IDPROP_H__ /** \file BKE_idprop.h * \ingroup bke @@ -204,4 +204,4 @@ void IDP_UnlinkProperty(struct IDProperty *prop); #define IDP_IDPArray(prop) ((IDProperty*)(prop)->data.pointer) #define IDP_Double(prop) (*(double*)&(prop)->data.val) -#endif /* _BKE_IDPROP_H */ +#endif /* __BKE_IDPROP_H__ */ diff --git a/source/blender/blenkernel/BKE_image.h b/source/blender/blenkernel/BKE_image.h index 5cdc3537f5b..5055372b68f 100644 --- a/source/blender/blenkernel/BKE_image.h +++ b/source/blender/blenkernel/BKE_image.h @@ -24,8 +24,8 @@ * * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BKE_IMAGE_H -#define BKE_IMAGE_H +#ifndef __BKE_IMAGE_H__ +#define __BKE_IMAGE_H__ /** \file BKE_image.h * \ingroup bke diff --git a/source/blender/blenkernel/BKE_ipo.h b/source/blender/blenkernel/BKE_ipo.h index d21b0597976..547e7de7634 100644 --- a/source/blender/blenkernel/BKE_ipo.h +++ b/source/blender/blenkernel/BKE_ipo.h @@ -24,8 +24,8 @@ * * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BKE_IPO_H -#define BKE_IPO_H +#ifndef __BKE_IPO_H__ +#define __BKE_IPO_H__ /** \file BKE_ipo.h * \ingroup bke diff --git a/source/blender/blenkernel/BKE_key.h b/source/blender/blenkernel/BKE_key.h index c055bb2004b..c1f75baf8ff 100644 --- a/source/blender/blenkernel/BKE_key.h +++ b/source/blender/blenkernel/BKE_key.h @@ -24,8 +24,8 @@ * * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BKE_KEY_H -#define BKE_KEY_H +#ifndef __BKE_KEY_H__ +#define __BKE_KEY_H__ /** \file BKE_key.h * \ingroup bke @@ -87,4 +87,4 @@ extern int slurph_opt; }; #endif -#endif // BKE_KEY_H +#endif // __BKE_KEY_H__ diff --git a/source/blender/blenkernel/BKE_lamp.h b/source/blender/blenkernel/BKE_lamp.h index cc9452ae155..50e25576320 100644 --- a/source/blender/blenkernel/BKE_lamp.h +++ b/source/blender/blenkernel/BKE_lamp.h @@ -25,8 +25,8 @@ * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BKE_LAMP_H -#define BKE_LAMP_H +#ifndef __BKE_LAMP_H__ +#define __BKE_LAMP_H__ /** \file BKE_lamp.h * \ingroup bke diff --git a/source/blender/blenkernel/BKE_lattice.h b/source/blender/blenkernel/BKE_lattice.h index b5395309896..8a1529a7ad0 100644 --- a/source/blender/blenkernel/BKE_lattice.h +++ b/source/blender/blenkernel/BKE_lattice.h @@ -25,8 +25,8 @@ * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BKE_LATTICE_H -#define BKE_LATTICE_H +#ifndef __BKE_LATTICE_H__ +#define __BKE_LATTICE_H__ /** \file BKE_lattice.h * \ingroup bke diff --git a/source/blender/blenkernel/BKE_library.h b/source/blender/blenkernel/BKE_library.h index e8d6c85664b..e18a510ac07 100644 --- a/source/blender/blenkernel/BKE_library.h +++ b/source/blender/blenkernel/BKE_library.h @@ -24,8 +24,8 @@ * * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BKE_LIBRARY_TYPES_H -#define BKE_LIBRARY_TYPES_H +#ifndef __BKE_LIBRARY_H__ +#define __BKE_LIBRARY_H__ /** \file BKE_library.h * \ingroup bke diff --git a/source/blender/blenkernel/BKE_main.h b/source/blender/blenkernel/BKE_main.h index 05ba60b8a5b..ffcbb6e40bc 100644 --- a/source/blender/blenkernel/BKE_main.h +++ b/source/blender/blenkernel/BKE_main.h @@ -24,8 +24,8 @@ * * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BKE_MAIN_H -#define BKE_MAIN_H +#ifndef __BKE_MAIN_H__ +#define __BKE_MAIN_H__ /** \file BKE_main.h * \ingroup bke diff --git a/source/blender/blenkernel/BKE_material.h b/source/blender/blenkernel/BKE_material.h index 0079ecb7d9c..3e73f6b9dd9 100644 --- a/source/blender/blenkernel/BKE_material.h +++ b/source/blender/blenkernel/BKE_material.h @@ -25,8 +25,8 @@ * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BKE_MATERIAL_H -#define BKE_MATERIAL_H +#ifndef __BKE_MATERIAL_H__ +#define __BKE_MATERIAL_H__ /** \file BKE_material.h * \ingroup bke diff --git a/source/blender/blenkernel/BKE_mball.h b/source/blender/blenkernel/BKE_mball.h index 3dde54fd811..e3b5a006edf 100644 --- a/source/blender/blenkernel/BKE_mball.h +++ b/source/blender/blenkernel/BKE_mball.h @@ -24,8 +24,8 @@ * * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BKE_MBALL_H -#define BKE_MBALL_H +#ifndef __BKE_MBALL_H__ +#define __BKE_MBALL_H__ /** \file BKE_mball.h * \ingroup bke diff --git a/source/blender/blenkernel/BKE_mesh.h b/source/blender/blenkernel/BKE_mesh.h index 30a4b154e31..ba6bf330b1e 100644 --- a/source/blender/blenkernel/BKE_mesh.h +++ b/source/blender/blenkernel/BKE_mesh.h @@ -24,8 +24,8 @@ * * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BKE_MESH_H -#define BKE_MESH_H +#ifndef __BKE_MESH_H__ +#define __BKE_MESH_H__ /** \file BKE_mesh.h * \ingroup bke @@ -213,4 +213,4 @@ void mesh_loops_to_mface_corners(struct CustomData *fdata, struct CustomData *ld } #endif -#endif /* BKE_MESH_H */ +#endif /* __BKE_MESH_H__ */ diff --git a/source/blender/blenkernel/BKE_modifier.h b/source/blender/blenkernel/BKE_modifier.h index f72bc5b93ec..895fe64bea8 100644 --- a/source/blender/blenkernel/BKE_modifier.h +++ b/source/blender/blenkernel/BKE_modifier.h @@ -24,8 +24,8 @@ * * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BKE_MODIFIER_H -#define BKE_MODIFIER_H +#ifndef __BKE_MODIFIER_H__ +#define __BKE_MODIFIER_H__ /** \file BKE_modifier.h * \ingroup bke diff --git a/source/blender/blenkernel/BKE_movieclip.h b/source/blender/blenkernel/BKE_movieclip.h index eabbf459584..2d78e924c90 100644 --- a/source/blender/blenkernel/BKE_movieclip.h +++ b/source/blender/blenkernel/BKE_movieclip.h @@ -24,8 +24,8 @@ * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BKE_MOVIECLIP_H -#define BKE_MOVIECLIP_H +#ifndef __BKE_MOVIECLIP_H__ +#define __BKE_MOVIECLIP_H__ /** \file BKE_movieclip.h * \ingroup bke diff --git a/source/blender/blenkernel/BKE_multires.h b/source/blender/blenkernel/BKE_multires.h index 4f1262cd523..53a92f8c2ce 100644 --- a/source/blender/blenkernel/BKE_multires.h +++ b/source/blender/blenkernel/BKE_multires.h @@ -25,8 +25,8 @@ * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BKE_MULTIRES_H -#define BKE_MULTIRES_H +#ifndef __BKE_MULTIRES_H__ +#define __BKE_MULTIRES_H__ /** \file BKE_multires.h * \ingroup bke @@ -94,5 +94,5 @@ void mdisp_apply_weight(const int S, const int corners, int x, int y, const int void mdisp_flip_disp(const int S, const int corners, const float axis_x[2], const float axis_y[2], float disp[3]); void mdisp_join_tris(struct MDisps *dst, struct MDisps *tri1, struct MDisps *tri2); -#endif // BKE_MULTIRES_H +#endif // __BKE_MULTIRES_H__ diff --git a/source/blender/blenkernel/BKE_navmesh_conversion.h b/source/blender/blenkernel/BKE_navmesh_conversion.h index ab5c2b19707..8de53ed8b8e 100644 --- a/source/blender/blenkernel/BKE_navmesh_conversion.h +++ b/source/blender/blenkernel/BKE_navmesh_conversion.h @@ -25,8 +25,8 @@ * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BKE_NAVMESH_CONVERSION_H -#define BKE_NAVMESH_CONVERSION_H +#ifndef __BKE_NAVMESH_CONVERSION_H__ +#define __BKE_NAVMESH_CONVERSION_H__ struct DerivedMesh; diff --git a/source/blender/blenkernel/BKE_nla.h b/source/blender/blenkernel/BKE_nla.h index 773c5ced1cb..921972c9fa8 100644 --- a/source/blender/blenkernel/BKE_nla.h +++ b/source/blender/blenkernel/BKE_nla.h @@ -25,8 +25,8 @@ * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BKE_NLA_H -#define BKE_NLA_H +#ifndef __BKE_NLA_H__ +#define __BKE_NLA_H__ /** \file BKE_nla.h * \ingroup bke diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h index 0cccd8a366b..ae2f9305894 100644 --- a/source/blender/blenkernel/BKE_node.h +++ b/source/blender/blenkernel/BKE_node.h @@ -25,8 +25,8 @@ * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BKE_NODE_H -#define BKE_NODE_H +#ifndef __BKE_NODE_H__ +#define __BKE_NODE_H__ /** \file BKE_node.h * \ingroup bke diff --git a/source/blender/blenkernel/BKE_object.h b/source/blender/blenkernel/BKE_object.h index 828b0b47e3a..ac703663864 100644 --- a/source/blender/blenkernel/BKE_object.h +++ b/source/blender/blenkernel/BKE_object.h @@ -25,8 +25,8 @@ * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BKE_OBJECT_H -#define BKE_OBJECT_H +#ifndef __BKE_OBJECT_H__ +#define __BKE_OBJECT_H__ /** \file BKE_object.h * \ingroup bke diff --git a/source/blender/blenkernel/BKE_ocean.h b/source/blender/blenkernel/BKE_ocean.h index c8ce3f8ce63..7c0d99b35ea 100644 --- a/source/blender/blenkernel/BKE_ocean.h +++ b/source/blender/blenkernel/BKE_ocean.h @@ -23,8 +23,8 @@ * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BKE_OCEAN_H -#define BKE_OCEAN_H +#ifndef __BKE_OCEAN_H__ +#define __BKE_OCEAN_H__ #ifdef __cplusplus extern "C" { diff --git a/source/blender/blenkernel/BKE_packedFile.h b/source/blender/blenkernel/BKE_packedFile.h index 606d6167937..1eff20cbd57 100644 --- a/source/blender/blenkernel/BKE_packedFile.h +++ b/source/blender/blenkernel/BKE_packedFile.h @@ -24,8 +24,8 @@ * * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BKE_PACKEDFILE_H -#define BKE_PACKEDFILE_H +#ifndef __BKE_PACKEDFILE_H__ +#define __BKE_PACKEDFILE_H__ /** \file BKE_packedFile.h * \ingroup bke diff --git a/source/blender/blenkernel/BKE_paint.h b/source/blender/blenkernel/BKE_paint.h index 081b79b44d6..c048dad82eb 100644 --- a/source/blender/blenkernel/BKE_paint.h +++ b/source/blender/blenkernel/BKE_paint.h @@ -25,8 +25,8 @@ * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BKE_PAINT_H -#define BKE_PAINT_H +#ifndef __BKE_PAINT_H__ +#define __BKE_PAINT_H__ /** \file BKE_paint.h * \ingroup bke diff --git a/source/blender/blenkernel/BKE_particle.h b/source/blender/blenkernel/BKE_particle.h index dbefbd95a15..c03ecca17cf 100644 --- a/source/blender/blenkernel/BKE_particle.h +++ b/source/blender/blenkernel/BKE_particle.h @@ -25,8 +25,8 @@ * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BKE_PARTICLE_H -#define BKE_PARTICLE_H +#ifndef __BKE_PARTICLE_H__ +#define __BKE_PARTICLE_H__ /** \file BKE_particle.h * \ingroup bke diff --git a/source/blender/blenkernel/BKE_plugin_types.h b/source/blender/blenkernel/BKE_plugin_types.h index 73c6dae35cf..8f9706f9833 100644 --- a/source/blender/blenkernel/BKE_plugin_types.h +++ b/source/blender/blenkernel/BKE_plugin_types.h @@ -24,8 +24,8 @@ * * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BKE_PLUGIN_TYPES_H -#define BKE_PLUGIN_TYPES_H +#ifndef __BKE_PLUGIN_TYPES_H__ +#define __BKE_PLUGIN_TYPES_H__ /** \file BKE_plugin_types.h * \ingroup bke diff --git a/source/blender/blenkernel/BKE_pointcache.h b/source/blender/blenkernel/BKE_pointcache.h index d1b0acf7142..38f0503b40d 100644 --- a/source/blender/blenkernel/BKE_pointcache.h +++ b/source/blender/blenkernel/BKE_pointcache.h @@ -25,8 +25,8 @@ * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BKE_POINTCACHE_H -#define BKE_POINTCACHE_H +#ifndef __BKE_POINTCACHE_H__ +#define __BKE_POINTCACHE_H__ /** \file BKE_pointcache.h * \ingroup bke diff --git a/source/blender/blenkernel/BKE_property.h b/source/blender/blenkernel/BKE_property.h index 779c83acf21..a29dc0e7be4 100644 --- a/source/blender/blenkernel/BKE_property.h +++ b/source/blender/blenkernel/BKE_property.h @@ -24,8 +24,8 @@ * * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BKE_PROPERTY_H -#define BKE_PROPERTY_H +#ifndef __BKE_PROPERTY_H__ +#define __BKE_PROPERTY_H__ /** \file BKE_property.h * \ingroup bke diff --git a/source/blender/blenkernel/BKE_report.h b/source/blender/blenkernel/BKE_report.h index 784f8a63757..fd372ae6d83 100644 --- a/source/blender/blenkernel/BKE_report.h +++ b/source/blender/blenkernel/BKE_report.h @@ -23,8 +23,8 @@ * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BKE_REPORT_H -#define BKE_REPORT_H +#ifndef __BKE_REPORT_H__ +#define __BKE_REPORT_H__ /** \file BKE_report.h * \ingroup bke diff --git a/source/blender/blenkernel/BKE_sca.h b/source/blender/blenkernel/BKE_sca.h index cfcc0e146d8..22b44511195 100644 --- a/source/blender/blenkernel/BKE_sca.h +++ b/source/blender/blenkernel/BKE_sca.h @@ -24,8 +24,8 @@ * * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BKE_SCA_H -#define BKE_SCA_H +#ifndef __BKE_SCA_H__ +#define __BKE_SCA_H__ /** \file BKE_sca.h * \ingroup bke diff --git a/source/blender/blenkernel/BKE_scene.h b/source/blender/blenkernel/BKE_scene.h index 2df5e7ac2c6..e46d99ed873 100644 --- a/source/blender/blenkernel/BKE_scene.h +++ b/source/blender/blenkernel/BKE_scene.h @@ -24,8 +24,8 @@ * * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BKE_SCENE_H -#define BKE_SCENE_H +#ifndef __BKE_SCENE_H__ +#define __BKE_SCENE_H__ /** \file BKE_scene.h * \ingroup bke diff --git a/source/blender/blenkernel/BKE_screen.h b/source/blender/blenkernel/BKE_screen.h index 44b92f70519..c254144b812 100644 --- a/source/blender/blenkernel/BKE_screen.h +++ b/source/blender/blenkernel/BKE_screen.h @@ -24,8 +24,8 @@ * * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BKE_SCREEN_H -#define BKE_SCREEN_H +#ifndef __BKE_SCREEN_H__ +#define __BKE_SCREEN_H__ /** \file BKE_screen.h * \ingroup bke diff --git a/source/blender/blenkernel/BKE_script.h b/source/blender/blenkernel/BKE_script.h index d8ceaf23652..7bd801a8177 100644 --- a/source/blender/blenkernel/BKE_script.h +++ b/source/blender/blenkernel/BKE_script.h @@ -24,8 +24,8 @@ * * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BKE_SCRIPT_H -#define BKE_SCRIPT_H +#ifndef __BKE_SCRIPT_H__ +#define __BKE_SCRIPT_H__ /** \file BKE_script.h * \ingroup bke @@ -46,4 +46,4 @@ void free_script (struct Script *script); } #endif -#endif /* BKE_SCRIPT_H */ +#endif /* __BKE_SCRIPT_H__ */ diff --git a/source/blender/blenkernel/BKE_sequencer.h b/source/blender/blenkernel/BKE_sequencer.h index ed0730b7f09..5c6058b1453 100644 --- a/source/blender/blenkernel/BKE_sequencer.h +++ b/source/blender/blenkernel/BKE_sequencer.h @@ -23,8 +23,8 @@ * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BKE_SEQUENCER_H -#define BKE_SEQUENCER_H +#ifndef __BKE_SEQUENCER_H__ +#define __BKE_SEQUENCER_H__ /** \file BKE_sequencer.h * \ingroup bke @@ -341,4 +341,4 @@ extern SequencerDrawView sequencer_view3d_cb; extern ListBase seqbase_clipboard; extern int seqbase_clipboard_frame; -#endif // BKE_SEQUENCER_H +#endif // __BKE_SEQUENCER_H__ diff --git a/source/blender/blenkernel/BKE_shrinkwrap.h b/source/blender/blenkernel/BKE_shrinkwrap.h index d1fef8b0ce1..446084053de 100644 --- a/source/blender/blenkernel/BKE_shrinkwrap.h +++ b/source/blender/blenkernel/BKE_shrinkwrap.h @@ -24,8 +24,8 @@ * * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BKE_SHRINKWRAP_H -#define BKE_SHRINKWRAP_H +#ifndef __BKE_SHRINKWRAP_H__ +#define __BKE_SHRINKWRAP_H__ /** \file BKE_shrinkwrap.h * \ingroup bke diff --git a/source/blender/blenkernel/BKE_sketch.h b/source/blender/blenkernel/BKE_sketch.h index 1dd82c1d8e6..76b3dbacf7f 100644 --- a/source/blender/blenkernel/BKE_sketch.h +++ b/source/blender/blenkernel/BKE_sketch.h @@ -19,8 +19,8 @@ * * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BKE_SKETCH_H -#define BKE_SKETCH_H +#ifndef __BKE_SKETCH_H__ +#define __BKE_SKETCH_H__ /** \file BKE_sketch.h * \ingroup bke diff --git a/source/blender/blenkernel/BKE_smoke.h b/source/blender/blenkernel/BKE_smoke.h index 51acef44f52..1e97bc07f99 100644 --- a/source/blender/blenkernel/BKE_smoke.h +++ b/source/blender/blenkernel/BKE_smoke.h @@ -25,8 +25,8 @@ * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BKE_SMOKE_H_ -#define BKE_SMOKE_H_ +#ifndef __BKE_SMOKE_H__ +#define __BKE_SMOKE_H__ /** \file BKE_smoke.h * \ingroup bke @@ -45,4 +45,4 @@ void smokeModifier_copy(struct SmokeModifierData *smd, struct SmokeModifierData long long smoke_get_mem_req(int xres, int yres, int zres, int amplify); -#endif /* BKE_SMOKE_H_ */ +#endif /* __BKE_SMOKE_H__ */ diff --git a/source/blender/blenkernel/BKE_softbody.h b/source/blender/blenkernel/BKE_softbody.h index c889aa83b9a..6714225f513 100644 --- a/source/blender/blenkernel/BKE_softbody.h +++ b/source/blender/blenkernel/BKE_softbody.h @@ -24,8 +24,8 @@ * * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BKE_SOFTBODY_H -#define BKE_SOFTBODY_H +#ifndef __BKE_SOFTBODY_H__ +#define __BKE_SOFTBODY_H__ /** \file BKE_softbody.h * \ingroup bke diff --git a/source/blender/blenkernel/BKE_sound.h b/source/blender/blenkernel/BKE_sound.h index fdf1d09559d..90477647b88 100644 --- a/source/blender/blenkernel/BKE_sound.h +++ b/source/blender/blenkernel/BKE_sound.h @@ -24,8 +24,8 @@ * * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BKE_SOUND_H -#define BKE_SOUND_H +#ifndef __BKE_SOUND_H__ +#define __BKE_SOUND_H__ /** \file BKE_sound.h * \ingroup bke diff --git a/source/blender/blenkernel/BKE_speaker.h b/source/blender/blenkernel/BKE_speaker.h index d309c048f1a..fddcfb2c7f3 100644 --- a/source/blender/blenkernel/BKE_speaker.h +++ b/source/blender/blenkernel/BKE_speaker.h @@ -25,8 +25,8 @@ * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BKE_SPEAKER_H -#define BKE_SPEAKER_H +#ifndef __BKE_SPEAKER_H__ +#define __BKE_SPEAKER_H__ /** \file BKE_speaker.h * \ingroup bke diff --git a/source/blender/blenkernel/BKE_subsurf.h b/source/blender/blenkernel/BKE_subsurf.h index dcbd045f62d..5e56cc7b3be 100644 --- a/source/blender/blenkernel/BKE_subsurf.h +++ b/source/blender/blenkernel/BKE_subsurf.h @@ -24,8 +24,8 @@ * * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BKE_SUBSURF_H -#define BKE_SUBSURF_H +#ifndef __BKE_SUBSURF_H__ +#define __BKE_SUBSURF_H__ /** \file BKE_subsurf.h * \ingroup bke diff --git a/source/blender/blenkernel/BKE_suggestions.h b/source/blender/blenkernel/BKE_suggestions.h index a0a270422c7..6168b98ac4c 100644 --- a/source/blender/blenkernel/BKE_suggestions.h +++ b/source/blender/blenkernel/BKE_suggestions.h @@ -24,8 +24,8 @@ * * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BKE_SUGGESTIONS_H -#define BKE_SUGGESTIONS_H +#ifndef __BKE_SUGGESTIONS_H__ +#define __BKE_SUGGESTIONS_H__ /** \file BKE_suggestions.h * \ingroup bke diff --git a/source/blender/blenkernel/BKE_text.h b/source/blender/blenkernel/BKE_text.h index f0c054560c4..504b859c183 100644 --- a/source/blender/blenkernel/BKE_text.h +++ b/source/blender/blenkernel/BKE_text.h @@ -24,8 +24,8 @@ * * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BKE_TEXT_H -#define BKE_TEXT_H +#ifndef __BKE_TEXT_H__ +#define __BKE_TEXT_H__ /** \file BKE_text.h * \ingroup bke diff --git a/source/blender/blenkernel/BKE_texture.h b/source/blender/blenkernel/BKE_texture.h index a67a06ef9fb..2574c45eec2 100644 --- a/source/blender/blenkernel/BKE_texture.h +++ b/source/blender/blenkernel/BKE_texture.h @@ -24,8 +24,8 @@ * * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BKE_TEXTURE_H -#define BKE_TEXTURE_H +#ifndef __BKE_TEXTURE_H__ +#define __BKE_TEXTURE_H__ /** \file BKE_texture.h * \ingroup bke diff --git a/source/blender/blenkernel/BKE_tracking.h b/source/blender/blenkernel/BKE_tracking.h index ebbba7de7c7..1be858ecf80 100644 --- a/source/blender/blenkernel/BKE_tracking.h +++ b/source/blender/blenkernel/BKE_tracking.h @@ -24,8 +24,8 @@ * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BKE_TRACKING_H -#define BKE_TRACKING_H +#ifndef __BKE_TRACKING_H__ +#define __BKE_TRACKING_H__ /** \file BKE_trackingp.h * \ingroup bke diff --git a/source/blender/blenkernel/BKE_unit.h b/source/blender/blenkernel/BKE_unit.h index db586f6d262..e3ad49e2225 100644 --- a/source/blender/blenkernel/BKE_unit.h +++ b/source/blender/blenkernel/BKE_unit.h @@ -20,8 +20,8 @@ * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BKE_UNIT_H -#define BKE_UNIT_H +#ifndef __BKE_UNIT_H__ +#define __BKE_UNIT_H__ /** \file BKE_unit.h * \ingroup bke @@ -76,4 +76,4 @@ double bUnit_GetScaler(void *usys_pt, int index); } #endif -#endif /* BKE_UNIT_H */ +#endif /* __BKE_UNIT_H__ */ diff --git a/source/blender/blenkernel/BKE_utildefines.h b/source/blender/blenkernel/BKE_utildefines.h index a6a9bb0c0f6..39458cb3a13 100644 --- a/source/blender/blenkernel/BKE_utildefines.h +++ b/source/blender/blenkernel/BKE_utildefines.h @@ -33,8 +33,8 @@ */ -#ifndef BKE_UTILDEFINES_H -#define BKE_UTILDEFINES_H +#ifndef __BKE_UTILDEFINES_H__ +#define __BKE_UTILDEFINES_H__ #ifdef __cplusplus extern "C" { @@ -89,4 +89,4 @@ extern "C" { } #endif -#endif // BKE_UTILDEFINES_H +#endif // __BKE_UTILDEFINES_H__ diff --git a/source/blender/blenkernel/BKE_world.h b/source/blender/blenkernel/BKE_world.h index fe25279dcfb..16ff3acaf71 100644 --- a/source/blender/blenkernel/BKE_world.h +++ b/source/blender/blenkernel/BKE_world.h @@ -24,8 +24,8 @@ * * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BKE_WORLD_H -#define BKE_WORLD_H +#ifndef __BKE_WORLD_H__ +#define __BKE_WORLD_H__ /** \file BKE_world.h * \ingroup bke diff --git a/source/blender/blenkernel/BKE_writeavi.h b/source/blender/blenkernel/BKE_writeavi.h index c906761f3d7..03174fb5284 100644 --- a/source/blender/blenkernel/BKE_writeavi.h +++ b/source/blender/blenkernel/BKE_writeavi.h @@ -25,8 +25,8 @@ * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BKE_WRITEAVI_H -#define BKE_WRITEAVI_H +#ifndef __BKE_WRITEAVI_H__ +#define __BKE_WRITEAVI_H__ /** \file BKE_writeavi.h * \ingroup bke diff --git a/source/blender/blenkernel/BKE_writeffmpeg.h b/source/blender/blenkernel/BKE_writeffmpeg.h index 4c42d1e4a6c..299f8e185cf 100644 --- a/source/blender/blenkernel/BKE_writeffmpeg.h +++ b/source/blender/blenkernel/BKE_writeffmpeg.h @@ -25,8 +25,8 @@ * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BKE_WRITEFFMPEG_H -#define BKE_WRITEFFMPEG_H +#ifndef __BKE_WRITEFFMPEG_H__ +#define __BKE_WRITEFFMPEG_H__ /** \file BKE_writeffmpeg.h * \ingroup bke diff --git a/source/blender/blenkernel/BKE_writeframeserver.h b/source/blender/blenkernel/BKE_writeframeserver.h index 040550d8faa..cb607e1473c 100644 --- a/source/blender/blenkernel/BKE_writeframeserver.h +++ b/source/blender/blenkernel/BKE_writeframeserver.h @@ -25,8 +25,8 @@ * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BKE_WRITEFRAMESERVER_H -#define BKE_WRITEFRAMESERVER_H +#ifndef __BKE_WRITEFRAMESERVER_H__ +#define __BKE_WRITEFRAMESERVER_H__ /** \file BKE_writeframeserver.h * \ingroup bke diff --git a/source/blender/blenkernel/depsgraph_private.h b/source/blender/blenkernel/depsgraph_private.h index 0338d10a66d..0db3c5615f5 100644 --- a/source/blender/blenkernel/depsgraph_private.h +++ b/source/blender/blenkernel/depsgraph_private.h @@ -27,8 +27,8 @@ * \ingroup bke */ -#ifndef DEPSGRAPH_PRIVATE -#define DEPSGRAPH_PRIVATE +#ifndef __DEPSGRAPH_PRIVATE_H__ +#define __DEPSGRAPH_PRIVATE_H__ #include "BKE_depsgraph.h" #include "DNA_constraint_types.h" diff --git a/source/blender/blenkernel/intern/bmesh_private.h b/source/blender/blenkernel/intern/bmesh_private.h index d0b03883e6e..10074813fae 100644 --- a/source/blender/blenkernel/intern/bmesh_private.h +++ b/source/blender/blenkernel/intern/bmesh_private.h @@ -35,8 +35,8 @@ */ -#ifndef BMESH_PRIVATE -#define BMESH_PRIVATE +#ifndef __BMESH_PRIVATE_H__ +#define __BMESH_PRIVATE_H__ #include "BKE_bmesh.h" diff --git a/source/blender/blenkernel/nla_private.h b/source/blender/blenkernel/nla_private.h index e287606921b..51a7ac7ee62 100644 --- a/source/blender/blenkernel/nla_private.h +++ b/source/blender/blenkernel/nla_private.h @@ -30,8 +30,8 @@ */ -#ifndef NLA_PRIVATE -#define NLA_PRIVATE +#ifndef __NLA_PRIVATE_H__ +#define __NLA_PRIVATE_H__ /* --------------- NLA Evaluation DataTypes ----------------------- */ @@ -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 +#endif // __NLA_PRIVATE_H__ diff --git a/source/blender/blenlib/BLI_args.h b/source/blender/blenlib/BLI_args.h index 3b8b60be1b9..7a7529fa3c3 100644 --- a/source/blender/blenlib/BLI_args.h +++ b/source/blender/blenlib/BLI_args.h @@ -25,8 +25,8 @@ * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BLI_ARGS_H -#define BLI_ARGS_H +#ifndef __BLI_ARGS_H__ +#define __BLI_ARGS_H__ /** \file BLI_args.h * \ingroup bli diff --git a/source/blender/blenlib/BLI_blenlib.h b/source/blender/blenlib/BLI_blenlib.h index 515c2444e80..c802b083f1f 100644 --- a/source/blender/blenlib/BLI_blenlib.h +++ b/source/blender/blenlib/BLI_blenlib.h @@ -55,8 +55,8 @@ * standard libraries. */ -#ifndef BLI_BLENLIB_H -#define BLI_BLENLIB_H +#ifndef __BLI_BLENLIB_H__ +#define __BLI_BLENLIB_H__ struct ListBase; diff --git a/source/blender/blenlib/BLI_boxpack2d.h b/source/blender/blenlib/BLI_boxpack2d.h index 886965f66b3..7f92047b312 100644 --- a/source/blender/blenlib/BLI_boxpack2d.h +++ b/source/blender/blenlib/BLI_boxpack2d.h @@ -25,8 +25,8 @@ * ***** END GPL LICENSE BLOCK ***** */ -#ifndef _BLI_BOXPACK2D_H_ -#define _BLI_BOXPACK2D_H_ +#ifndef __BLI_BOXPACK2D_H__ +#define __BLI_BOXPACK2D_H__ /** \file BLI_boxpack2d.h * \ingroup bli diff --git a/source/blender/blenlib/BLI_bpath.h b/source/blender/blenlib/BLI_bpath.h index e850db5a171..f1639bdb3c1 100644 --- a/source/blender/blenlib/BLI_bpath.h +++ b/source/blender/blenlib/BLI_bpath.h @@ -31,8 +31,8 @@ * so for BPath we dont need to malloc */ -#ifndef BLI_BPATH_H -#define BLI_BPATH_H +#ifndef __BLI_BPATH_H__ +#define __BLI_BPATH_H__ struct ID; struct ListBase; @@ -64,4 +64,4 @@ void makeFilesRelative(struct Main *bmain, const char *basedir, struct ReportLis void makeFilesAbsolute(struct Main *bmain, const char *basedir, struct ReportList *reports); void findMissingFiles(struct Main *bmain, const char *searchpath, struct ReportList *reports); -#endif // BLI_BPATH_H +#endif // __BLI_BPATH_H__ diff --git a/source/blender/blenlib/BLI_callbacks.h b/source/blender/blenlib/BLI_callbacks.h index 201ada45acf..f4f92a0cbee 100644 --- a/source/blender/blenlib/BLI_callbacks.h +++ b/source/blender/blenlib/BLI_callbacks.h @@ -29,8 +29,8 @@ * \ingroup bli */ -#ifndef BLI_CALLBACKS_H -#define BLI_CALLBACKS_H +#ifndef __BLI_CALLBACKS_H__ +#define __BLI_CALLBACKS_H__ struct bContext; struct Main; @@ -70,4 +70,4 @@ void BLI_cb_finalize(void); /* This is blenlib internal only, unrelated to above */ void callLocalErrorCallBack(const char* msg); -#endif /* BLI_CALLBACKS_H */ +#endif /* __BLI_CALLBACKS_H__ */ diff --git a/source/blender/blenlib/BLI_cpu.h b/source/blender/blenlib/BLI_cpu.h index de04a2a6cc6..fa29162e59e 100644 --- a/source/blender/blenlib/BLI_cpu.h +++ b/source/blender/blenlib/BLI_cpu.h @@ -18,8 +18,8 @@ * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BLI_CPU_H -#define BLI_CPU_H +#ifndef __BLI_CPU_H__ +#define __BLI_CPU_H__ /** \file BLI_cpu.h * \ingroup bli diff --git a/source/blender/blenlib/BLI_dlrbTree.h b/source/blender/blenlib/BLI_dlrbTree.h index cde2058b200..bad74a1e5a8 100644 --- a/source/blender/blenlib/BLI_dlrbTree.h +++ b/source/blender/blenlib/BLI_dlrbTree.h @@ -23,8 +23,8 @@ * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BLI_DLRB_TREE_H -#define BLI_DLRB_TREE_H +#ifndef __BLI_DLRBTREE_H__ +#define __BLI_DLRBTREE_H__ /** \file BLI_dlrbTree.h * \ingroup bli @@ -158,4 +158,4 @@ void BLI_dlrbTree_insert(DLRBT_Tree *tree, DLRBT_Node *node); /* ********************************************** */ -#endif // BLI_DLRB_TREE_H +#endif // __BLI_DLRBTREE_H__ diff --git a/source/blender/blenlib/BLI_dynstr.h b/source/blender/blenlib/BLI_dynstr.h index 32c4e012d1d..6b499c3bbcf 100644 --- a/source/blender/blenlib/BLI_dynstr.h +++ b/source/blender/blenlib/BLI_dynstr.h @@ -25,8 +25,8 @@ * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BLI_DYNSTR_H -#define BLI_DYNSTR_H +#ifndef __BLI_DYNSTR_H__ +#define __BLI_DYNSTR_H__ /** \file BLI_dynstr.h * \ingroup bli diff --git a/source/blender/blenlib/BLI_edgehash.h b/source/blender/blenlib/BLI_edgehash.h index 9153155e359..b00ac683eb1 100644 --- a/source/blender/blenlib/BLI_edgehash.h +++ b/source/blender/blenlib/BLI_edgehash.h @@ -25,8 +25,8 @@ * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BLI_EDGEHASH_H -#define BLI_EDGEHASH_H +#ifndef __BLI_EDGEHASH_H__ +#define __BLI_EDGEHASH_H__ /** \file BLI_edgehash.h * \ingroup bli diff --git a/source/blender/blenlib/BLI_editVert.h b/source/blender/blenlib/BLI_editVert.h index 0ddea230b84..b5096abc5bc 100644 --- a/source/blender/blenlib/BLI_editVert.h +++ b/source/blender/blenlib/BLI_editVert.h @@ -25,8 +25,8 @@ * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BLI_EDITVERT_H -#define BLI_EDITVERT_H +#ifndef __BLI_EDITVERT_H__ +#define __BLI_EDITVERT_H__ /** \file BLI_editVert.h * \ingroup bli diff --git a/source/blender/blenlib/BLI_fileops.h b/source/blender/blenlib/BLI_fileops.h index 2e8f1a5512e..8fe8456e845 100644 --- a/source/blender/blenlib/BLI_fileops.h +++ b/source/blender/blenlib/BLI_fileops.h @@ -30,8 +30,8 @@ * \brief File and directory operations. * */ -#ifndef BLI_FILEOPS_H -#define BLI_FILEOPS_H +#ifndef __BLI_FILEOPS_H__ +#define __BLI_FILEOPS_H__ #ifdef __cplusplus extern "C" { diff --git a/source/blender/blenlib/BLI_fileops_types.h b/source/blender/blenlib/BLI_fileops_types.h index 443ba654cb6..8e4b5b3e411 100644 --- a/source/blender/blenlib/BLI_fileops_types.h +++ b/source/blender/blenlib/BLI_fileops_types.h @@ -25,8 +25,8 @@ * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BLI_FILEOPS_TYPES_H -#define BLI_FILEOPS_TYPES_H +#ifndef __BLI_FILEOPS_TYPES_H__ +#define __BLI_FILEOPS_TYPES_H__ /** \file BLI_fileops_types.h * \ingroup bli @@ -74,5 +74,5 @@ struct dirlink char *name; }; -#endif /* BLI_FILEOPS_TYPES_H */ +#endif /* __BLI_FILEOPS_TYPES_H__ */ diff --git a/source/blender/blenlib/BLI_fnmatch.h b/source/blender/blenlib/BLI_fnmatch.h index ac8960ff9c9..711d1aa756b 100644 --- a/source/blender/blenlib/BLI_fnmatch.h +++ b/source/blender/blenlib/BLI_fnmatch.h @@ -17,8 +17,8 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef _FNMATCH_H -#define _FNMATCH_H 1 +#ifndef __BLI_FNMATCH_H__ +#define __BLI_FNMATCH_H__ /** \file BLI_fnmatch.h * \ingroup bli @@ -69,4 +69,4 @@ extern int fnmatch __P ((const char *__pattern, const char *__string, } #endif -#endif /* fnmatch.h */ +#endif /* __BLI_FNMATCH_H__ */ diff --git a/source/blender/blenlib/BLI_ghash.h b/source/blender/blenlib/BLI_ghash.h index f2a7e73e5e0..ccad3250a5f 100644 --- a/source/blender/blenlib/BLI_ghash.h +++ b/source/blender/blenlib/BLI_ghash.h @@ -25,8 +25,8 @@ * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BLI_GHASH_H -#define BLI_GHASH_H +#ifndef __BLI_GHASH_H__ +#define __BLI_GHASH_H__ /** \file BLI_ghash.h * \ingroup bli @@ -156,4 +156,4 @@ void BLI_ghashutil_pairfree (void *ptr); } #endif -#endif /* BLI_GHASH_H */ +#endif /* __BLI_GHASH_H__ */ diff --git a/source/blender/blenlib/BLI_graph.h b/source/blender/blenlib/BLI_graph.h index 056bba71dea..5995daebc61 100644 --- a/source/blender/blenlib/BLI_graph.h +++ b/source/blender/blenlib/BLI_graph.h @@ -22,8 +22,8 @@ * * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BLI_GRAPH_H_ -#define BLI_GRAPH_H_ +#ifndef __BLI_GRAPH_H__ +#define __BLI_GRAPH_H__ /** \file BLI_graph.h * \ingroup bli @@ -184,4 +184,4 @@ void BLI_mirrorAlongAxis(float v[3], float center[3], float axis[3]); /* Anything higher is the order in radial symmetry */ #define SYM_SIDE_RADIAL 3 -#endif /*BLI_GRAPH_H_*/ +#endif /*__BLI_GRAPH_H__*/ diff --git a/source/blender/blenlib/BLI_gsqueue.h b/source/blender/blenlib/BLI_gsqueue.h index 425ecb79899..53fdb5a541a 100644 --- a/source/blender/blenlib/BLI_gsqueue.h +++ b/source/blender/blenlib/BLI_gsqueue.h @@ -25,8 +25,8 @@ * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BLI_GSQUEUE_H -#define BLI_GSQUEUE_H +#ifndef __BLI_GSQUEUE_H__ +#define __BLI_GSQUEUE_H__ /** \file BLI_gsqueue.h * \ingroup bli @@ -95,5 +95,5 @@ void BLI_gsqueue_pushback (GSQueue *gq, void *item); */ void BLI_gsqueue_free (GSQueue *gq); -#endif /* BLI_GSQUEUE_H */ +#endif /* __BLI_GSQUEUE_H__ */ diff --git a/source/blender/blenlib/BLI_heap.h b/source/blender/blenlib/BLI_heap.h index 0124c997d91..5c67bf52b9a 100644 --- a/source/blender/blenlib/BLI_heap.h +++ b/source/blender/blenlib/BLI_heap.h @@ -25,8 +25,8 @@ * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BLI_HEAP_H -#define BLI_HEAP_H +#ifndef __BLI_HEAP_H__ +#define __BLI_HEAP_H__ /** \file BLI_heap.h * \ingroup bli diff --git a/source/blender/blenlib/BLI_jitter.h b/source/blender/blenlib/BLI_jitter.h index f432a51de9f..9aa21a89521 100644 --- a/source/blender/blenlib/BLI_jitter.h +++ b/source/blender/blenlib/BLI_jitter.h @@ -25,8 +25,8 @@ * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BLI_JITTER_H -#define BLI_JITTER_H +#ifndef __BLI_JITTER_H__ +#define __BLI_JITTER_H__ /** \file BLI_jitter.h * \ingroup bli diff --git a/source/blender/blenlib/BLI_kdopbvh.h b/source/blender/blenlib/BLI_kdopbvh.h index 8ead7bf5f17..ff3017fef03 100644 --- a/source/blender/blenlib/BLI_kdopbvh.h +++ b/source/blender/blenlib/BLI_kdopbvh.h @@ -26,8 +26,8 @@ */ -#ifndef BLI_KDOPBVH_H -#define BLI_KDOPBVH_H +#ifndef __BLI_KDOPBVH_H__ +#define __BLI_KDOPBVH_H__ /** \file BLI_kdopbvh.h * \ingroup bli @@ -111,5 +111,5 @@ int BLI_bvhtree_range_query(BVHTree *tree, const float co[3], float radius, BVHT } #endif -#endif // BLI_KDOPBVH_H +#endif // __BLI_KDOPBVH_H__ diff --git a/source/blender/blenlib/BLI_kdtree.h b/source/blender/blenlib/BLI_kdtree.h index 9ffc64e8812..0ec514b4480 100644 --- a/source/blender/blenlib/BLI_kdtree.h +++ b/source/blender/blenlib/BLI_kdtree.h @@ -26,8 +26,8 @@ * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BLI_KDTREE_H -#define BLI_KDTREE_H +#ifndef __BLI_KDTREE_H__ +#define __BLI_KDTREE_H__ /** \file BLI_kdtree.h * \ingroup bli diff --git a/source/blender/blenlib/BLI_linklist.h b/source/blender/blenlib/BLI_linklist.h index 6886dff0da3..664beb4eb98 100644 --- a/source/blender/blenlib/BLI_linklist.h +++ b/source/blender/blenlib/BLI_linklist.h @@ -25,8 +25,8 @@ * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BLI_LINKLIST_H -#define BLI_LINKLIST_H +#ifndef __BLI_LINKLIST_H__ +#define __BLI_LINKLIST_H__ /** \file BLI_linklist.h * \ingroup bli diff --git a/source/blender/blenlib/BLI_listbase.h b/source/blender/blenlib/BLI_listbase.h index 88ee79d7b97..b0a5e80d850 100644 --- a/source/blender/blenlib/BLI_listbase.h +++ b/source/blender/blenlib/BLI_listbase.h @@ -25,8 +25,8 @@ * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BLI_LISTBASE_H -#define BLI_LISTBASE_H +#ifndef __BLI_LISTBASE_H__ +#define __BLI_LISTBASE_H__ /** \file BLI_listbase.h * \ingroup bli diff --git a/source/blender/blenlib/BLI_math.h b/source/blender/blenlib/BLI_math.h index 1fe700492be..89c37daae84 100644 --- a/source/blender/blenlib/BLI_math.h +++ b/source/blender/blenlib/BLI_math.h @@ -23,8 +23,8 @@ * ***** END GPL LICENSE BLOCK ***** * */ -#ifndef BLI_MATH_H -#define BLI_MATH_H +#ifndef __BLI_MATH_H__ +#define __BLI_MATH_H__ /** \file BLI_math.h * \ingroup bli @@ -59,5 +59,5 @@ #include "BLI_math_vector.h" #include "BLI_math_geom.h" -#endif /* BLI_MATH_H */ +#endif /* __BLI_MATH_H__ */ diff --git a/source/blender/blenlib/BLI_math_base.h b/source/blender/blenlib/BLI_math_base.h index 53db77dc203..d0a1311f2bc 100644 --- a/source/blender/blenlib/BLI_math_base.h +++ b/source/blender/blenlib/BLI_math_base.h @@ -23,8 +23,8 @@ * ***** END GPL LICENSE BLOCK ***** * */ -#ifndef BLI_MATH_BASE_H -#define BLI_MATH_BASE_H +#ifndef __BLI_MATH_BASE_H__ +#define __BLI_MATH_BASE_H__ /** \file BLI_math_base.h * \ingroup bli @@ -142,7 +142,7 @@ #define CLAMP(a, b, c) if((a)<(b)) (a)=(b); else if((a)>(c)) (a)=(c) #endif -#ifdef BLI_MATH_INLINE_H +#ifdef __BLI_MATH_INLINE_H__ #include "intern/math_base_inline.c" #endif @@ -181,5 +181,5 @@ extern double round(double x); double double_round(double x, int ndigits); -#endif /* BLI_MATH_BASE_H */ +#endif /* __BLI_MATH_BASE_H__ */ diff --git a/source/blender/blenlib/BLI_math_color.h b/source/blender/blenlib/BLI_math_color.h index f4d6882b5d8..4771fdbcb69 100644 --- a/source/blender/blenlib/BLI_math_color.h +++ b/source/blender/blenlib/BLI_math_color.h @@ -23,8 +23,8 @@ * ***** END GPL LICENSE BLOCK ***** * */ -#ifndef BLI_MATH_COLOR_H -#define BLI_MATH_COLOR_H +#ifndef __BLI_MATH_COLOR_H__ +#define __BLI_MATH_COLOR_H__ /** \file BLI_math_color.h * \ingroup bli @@ -113,7 +113,7 @@ void rgba_float_to_uchar(unsigned char col_r[4], const float col_f[4]); void lift_gamma_gain_to_asc_cdl(float *lift, float *gamma, float *gain, float *offset, float *slope, float *power); -#ifdef BLI_MATH_INLINE_H +#ifdef __BLI_MATH_INLINE_H__ #include "intern/math_color_inline.c" #endif @@ -121,5 +121,5 @@ void lift_gamma_gain_to_asc_cdl(float *lift, float *gamma, float *gain, float *o } #endif -#endif /* BLI_MATH_COLOR_H */ +#endif /* __BLI_MATH_COLOR_H__ */ diff --git a/source/blender/blenlib/BLI_math_geom.h b/source/blender/blenlib/BLI_math_geom.h index 8d18f5253c4..61e34b7cb75 100644 --- a/source/blender/blenlib/BLI_math_geom.h +++ b/source/blender/blenlib/BLI_math_geom.h @@ -23,8 +23,8 @@ * ***** END GPL LICENSE BLOCK ***** * */ -#ifndef BLI_MATH_GEOM_H -#define BLI_MATH_GEOM_H +#ifndef __BLI_MATH_GEOM_H__ +#define __BLI_MATH_GEOM_H__ /** \file BLI_math_geom.h * \ingroup bli @@ -36,7 +36,7 @@ extern "C" { #include "BLI_math_inline.h" -#ifdef BLI_MATH_INLINE_H +#ifdef __BLI_MATH_INLINE_H__ #include "intern/math_geom_inline.c" #endif @@ -273,5 +273,5 @@ void axis_dominant_v3(int *axis_a, int *axis_b, const float axis[3]); } #endif -#endif /* BLI_MATH_GEOM_H */ +#endif /* __BLI_MATH_GEOM_H__ */ diff --git a/source/blender/blenlib/BLI_math_inline.h b/source/blender/blenlib/BLI_math_inline.h index 83aeb6cb735..fcc5fb744bb 100644 --- a/source/blender/blenlib/BLI_math_inline.h +++ b/source/blender/blenlib/BLI_math_inline.h @@ -23,8 +23,8 @@ * ***** END GPL LICENSE BLOCK ***** * */ -#ifndef BLI_MATH_INLINE_H -#define BLI_MATH_INLINE_H +#ifndef __BLI_MATH_INLINE_H__ +#define __BLI_MATH_INLINE_H__ /** \file BLI_math_inline.h * \ingroup bli @@ -35,9 +35,9 @@ extern "C" { #endif /* add platform/compiler checks here if it is not supported */ -#define BLI_MATH_INLINE_H +#define __BLI_MATH_INLINE_H__ -#ifdef BLI_MATH_INLINE_H +#ifdef __BLI_MATH_INLINE_H__ #ifdef _MSC_VER #define MINLINE static __forceinline #define MALWAYS_INLINE MINLINE @@ -59,5 +59,5 @@ extern "C" { } #endif -#endif /* BLI_MATH_INLINE_H */ +#endif /* __BLI_MATH_INLINE_H__ */ diff --git a/source/blender/blenlib/BLI_math_matrix.h b/source/blender/blenlib/BLI_math_matrix.h index 4d3a4dfe445..8c19941e18c 100644 --- a/source/blender/blenlib/BLI_math_matrix.h +++ b/source/blender/blenlib/BLI_math_matrix.h @@ -23,8 +23,8 @@ * ***** END GPL LICENSE BLOCK ***** * */ -#ifndef BLI_MATH_MATRIX_H -#define BLI_MATH_MATRIX_H +#ifndef __BLI_MATH_MATRIX_H__ +#define __BLI_MATH_MATRIX_H__ /** \file BLI_math_matrix.h * \ingroup bli @@ -179,5 +179,5 @@ void print_m4(const char *str, float M[3][4]); } #endif -#endif /* BLI_MATH_MATRIX_H */ +#endif /* __BLI_MATH_MATRIX_H__ */ diff --git a/source/blender/blenlib/BLI_math_rotation.h b/source/blender/blenlib/BLI_math_rotation.h index fca7c3469a1..62b81530c65 100644 --- a/source/blender/blenlib/BLI_math_rotation.h +++ b/source/blender/blenlib/BLI_math_rotation.h @@ -23,8 +23,8 @@ * ***** END GPL LICENSE BLOCK ***** * */ -#ifndef BLI_MATH_ROTATION_H -#define BLI_MATH_ROTATION_H +#ifndef __BLI_MATH_ROTATION_H__ +#define __BLI_MATH_ROTATION_H__ /** \file BLI_math_rotation.h * \ingroup bli @@ -189,5 +189,5 @@ float angle_wrap_deg(float angle); } #endif -#endif /* BLI_MATH_ROTATION_H */ +#endif /* __BLI_MATH_ROTATION_H__ */ diff --git a/source/blender/blenlib/BLI_math_vector.h b/source/blender/blenlib/BLI_math_vector.h index 12a0b1892a1..af8b52a7edf 100644 --- a/source/blender/blenlib/BLI_math_vector.h +++ b/source/blender/blenlib/BLI_math_vector.h @@ -23,8 +23,8 @@ * ***** END GPL LICENSE BLOCK ***** * */ -#ifndef BLI_MATH_VECTOR_H -#define BLI_MATH_VECTOR_H +#ifndef __BLI_MATH_VECTOR_H__ +#define __BLI_MATH_VECTOR_H__ /** \file BLI_math_vector.h * \ingroup bli @@ -36,7 +36,7 @@ extern "C" { #include "BLI_math_inline.h" -#ifdef BLI_MATH_INLINE_H +#ifdef __BLI_MATH_INLINE_H__ #include "intern/math_vector_inline.c" #endif @@ -216,5 +216,5 @@ void fill_vn_fl(float *array_tar, const int size, const float val); } #endif -#endif /* BLI_MATH_VECTOR_H */ +#endif /* __BLI_MATH_VECTOR_H__ */ diff --git a/source/blender/blenlib/BLI_md5.h b/source/blender/blenlib/BLI_md5.h index afcc3cdfa3e..51211d548cd 100644 --- a/source/blender/blenlib/BLI_md5.h +++ b/source/blender/blenlib/BLI_md5.h @@ -18,8 +18,8 @@ * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BLI_MD5_H -#define BLI_MD5_H +#ifndef __BLI_MD5_H__ +#define __BLI_MD5_H__ /** \file BLI_md5.h * \ingroup bli diff --git a/source/blender/blenlib/BLI_memarena.h b/source/blender/blenlib/BLI_memarena.h index ceb7b17f7ef..8306a69e567 100644 --- a/source/blender/blenlib/BLI_memarena.h +++ b/source/blender/blenlib/BLI_memarena.h @@ -35,8 +35,8 @@ * data, which are all freed at the same moment. */ -#ifndef BLI_MEMARENA_H -#define BLI_MEMARENA_H +#ifndef __BLI_MEMARENA_H__ +#define __BLI_MEMARENA_H__ #ifdef __cplusplus extern "C" { diff --git a/source/blender/blenlib/BLI_mempool.h b/source/blender/blenlib/BLI_mempool.h index 77896709285..d80d46e9ae5 100644 --- a/source/blender/blenlib/BLI_mempool.h +++ b/source/blender/blenlib/BLI_mempool.h @@ -25,8 +25,8 @@ * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BLI_MEMPOOL_H -#define BLI_MEMPOOL_H +#ifndef __BLI_MEMPOOL_H__ +#define __BLI_MEMPOOL_H__ /** \file BLI_mempool.h * \ingroup bli diff --git a/source/blender/blenlib/BLI_noise.h b/source/blender/blenlib/BLI_noise.h index de2efb18216..9f5475ced25 100644 --- a/source/blender/blenlib/BLI_noise.h +++ b/source/blender/blenlib/BLI_noise.h @@ -26,8 +26,8 @@ * */ -#ifndef BLI_NOISE_H -#define BLI_NOISE_H +#ifndef __BLI_NOISE_H__ +#define __BLI_NOISE_H__ /** \file BLI_noise.h * \ingroup bli diff --git a/source/blender/blenlib/BLI_path_util.h b/source/blender/blenlib/BLI_path_util.h index 68bb1a7280d..a2d432b492a 100644 --- a/source/blender/blenlib/BLI_path_util.h +++ b/source/blender/blenlib/BLI_path_util.h @@ -24,8 +24,8 @@ * * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BLI_PATH_UTIL_H -#define BLI_PATH_UTIL_H +#ifndef __BLI_PATH_UTIL_H__ +#define __BLI_PATH_UTIL_H__ /** \file BLI_path_util.h * \ingroup bli diff --git a/source/blender/blenlib/BLI_pbvh.h b/source/blender/blenlib/BLI_pbvh.h index e17a37c0a12..ef32ec03a61 100644 --- a/source/blender/blenlib/BLI_pbvh.h +++ b/source/blender/blenlib/BLI_pbvh.h @@ -18,8 +18,8 @@ * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BLI_PBVH_H -#define BLI_PBVH_H +#ifndef __BLI_PBVH_H__ +#define __BLI_PBVH_H__ /** \file BLI_pbvh.h * \ingroup bli @@ -246,5 +246,5 @@ void BLI_pbvh_gather_proxies(PBVH* pbvh, PBVHNode*** nodes, int* totnode); //void BLI_pbvh_node_BB_reset(PBVHNode* node); //void BLI_pbvh_node_BB_expand(PBVHNode* node, float co[3]); -#endif /* BLI_PBVH_H */ +#endif /* __BLI_PBVH_H__ */ diff --git a/source/blender/blenlib/BLI_rand.h b/source/blender/blenlib/BLI_rand.h index 7ce0031bcf9..1749bbcc38a 100644 --- a/source/blender/blenlib/BLI_rand.h +++ b/source/blender/blenlib/BLI_rand.h @@ -25,8 +25,8 @@ * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BLI_RAND_H -#define BLI_RAND_H +#ifndef __BLI_RAND_H__ +#define __BLI_RAND_H__ /** \file BLI_rand.h * \ingroup bli diff --git a/source/blender/blenlib/BLI_rect.h b/source/blender/blenlib/BLI_rect.h index 25b7f193105..4ff203737a0 100644 --- a/source/blender/blenlib/BLI_rect.h +++ b/source/blender/blenlib/BLI_rect.h @@ -26,8 +26,8 @@ * */ -#ifndef BLI_RECT_H -#define BLI_RECT_H +#ifndef __BLI_RECT_H__ +#define __BLI_RECT_H__ /** \file BLI_rect.h * \ingroup bli diff --git a/source/blender/blenlib/BLI_scanfill.h b/source/blender/blenlib/BLI_scanfill.h index 8af98b2d348..5c788bc6bb7 100644 --- a/source/blender/blenlib/BLI_scanfill.h +++ b/source/blender/blenlib/BLI_scanfill.h @@ -25,8 +25,8 @@ * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BLI_SCANFILL_H -#define BLI_SCANFILL_H +#ifndef __BLI_SCANFILL_H__ +#define __BLI_SCANFILL_H__ /** \file BLI_scanfill.h * \ingroup bli diff --git a/source/blender/blenlib/BLI_string.h b/source/blender/blenlib/BLI_string.h index 46389a9259e..25eb2ebecc2 100644 --- a/source/blender/blenlib/BLI_string.h +++ b/source/blender/blenlib/BLI_string.h @@ -25,8 +25,8 @@ * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BLI_STRING_H -#define BLI_STRING_H +#ifndef __BLI_STRING_H__ +#define __BLI_STRING_H__ /** \file BLI_string.h * \ingroup bli diff --git a/source/blender/blenlib/BLI_string_utf8.h b/source/blender/blenlib/BLI_string_utf8.h index 6eba7d5eb49..7799c32c4b7 100644 --- a/source/blender/blenlib/BLI_string_utf8.h +++ b/source/blender/blenlib/BLI_string_utf8.h @@ -20,8 +20,8 @@ * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BLI_STRING_UTF8_H -#define BLI_STRING_UTF8_H +#ifndef __BLI_STRING_UTF8_H__ +#define __BLI_STRING_UTF8_H__ /** \file BLI_string_utf8.h * \ingroup bli diff --git a/source/blender/blenlib/BLI_threads.h b/source/blender/blenlib/BLI_threads.h index a513b9f9e85..8e75a2db629 100644 --- a/source/blender/blenlib/BLI_threads.h +++ b/source/blender/blenlib/BLI_threads.h @@ -27,8 +27,8 @@ * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BLI_THREADS_H -#define BLI_THREADS_H +#ifndef __BLI_THREADS_H__ +#define __BLI_THREADS_H__ /** \file BLI_threads.h * \ingroup bli diff --git a/source/blender/blenlib/BLI_utildefines.h b/source/blender/blenlib/BLI_utildefines.h index 6d9188c1848..4a5ccd311c6 100644 --- a/source/blender/blenlib/BLI_utildefines.h +++ b/source/blender/blenlib/BLI_utildefines.h @@ -25,8 +25,8 @@ * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BLI_UTILDEFINES_H -#define BLI_UTILDEFINES_H +#ifndef __BLI_UTILDEFINES_H__ +#define __BLI_UTILDEFINES_H__ /** \file BLI_utildefines.h * \ingroup bli @@ -310,4 +310,4 @@ # define UNLIKELY(x) (x) #endif -#endif // BLI_UTILDEFINES_H +#endif // __BLI_UTILDEFINES_H__ diff --git a/source/blender/blenlib/BLI_uvproject.h b/source/blender/blenlib/BLI_uvproject.h index d4a34a9e290..5abad87452c 100644 --- a/source/blender/blenlib/BLI_uvproject.h +++ b/source/blender/blenlib/BLI_uvproject.h @@ -17,8 +17,8 @@ * * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BKE_UVPROJECT_H -#define BKE_UVPROJECT_H +#ifndef __BLI_UVPROJECT_H__ +#define __BLI_UVPROJECT_H__ /** \file BLI_uvproject.h * \ingroup bli diff --git a/source/blender/blenlib/BLI_vfontdata.h b/source/blender/blenlib/BLI_vfontdata.h index e858e784991..5f7b7c39036 100644 --- a/source/blender/blenlib/BLI_vfontdata.h +++ b/source/blender/blenlib/BLI_vfontdata.h @@ -25,8 +25,8 @@ * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BLI_VFONTDATA_H -#define BLI_VFONTDATA_H +#ifndef __BLI_VFONTDATA_H__ +#define __BLI_VFONTDATA_H__ /** \file BLI_vfontdata.h * \ingroup bli diff --git a/source/blender/blenlib/BLI_voxel.h b/source/blender/blenlib/BLI_voxel.h index 8dd95a897ae..4a13810a705 100644 --- a/source/blender/blenlib/BLI_voxel.h +++ b/source/blender/blenlib/BLI_voxel.h @@ -25,8 +25,8 @@ * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BLI_VOXEL_H -#define BLI_VOXEL_H +#ifndef __BLI_VOXEL_H__ +#define __BLI_VOXEL_H__ /** \file BLI_voxel.h * \ingroup bli @@ -41,4 +41,4 @@ float voxel_sample_trilinear(float *data, const int res[3], const float co[3]); float voxel_sample_triquadratic(float *data, const int res[3], const float co[3]); float voxel_sample_tricubic(float *data, const int res[3], const float co[3], int bspline); -#endif /* BLI_VOXEL_H */ +#endif /* __BLI_VOXEL_H__ */ diff --git a/source/blender/blenlib/BLI_winstuff.h b/source/blender/blenlib/BLI_winstuff.h index 0eb2f86b668..d939882b105 100644 --- a/source/blender/blenlib/BLI_winstuff.h +++ b/source/blender/blenlib/BLI_winstuff.h @@ -25,8 +25,8 @@ * ***** END GPL LICENSE BLOCK ***** */ -#ifndef __WINSTUFF_H__ -#define __WINSTUFF_H__ +#ifndef __BLI_WINSTUFF_H__ +#define __BLI_WINSTUFF_H__ /** \file BLI_winstuff.h * \ingroup bli @@ -150,5 +150,5 @@ int BLI_getInstallationDir(char *str); #endif /* _WIN32 */ -#endif /* __WINSTUFF_H__ */ +#endif /* __BLI_WINSTUFF_H__ */ diff --git a/source/blender/blenlib/PIL_time.h b/source/blender/blenlib/PIL_time.h index 0a777a80b2a..fa2ad8644e9 100644 --- a/source/blender/blenlib/PIL_time.h +++ b/source/blender/blenlib/PIL_time.h @@ -32,8 +32,8 @@ */ -#ifndef PIL_TIME_H -#define PIL_TIME_H +#ifndef __PIL_TIME_H__ +#define __PIL_TIME_H__ #ifdef __cplusplus extern "C" { @@ -78,4 +78,4 @@ void PIL_sleep_ms (int ms); } #endif -#endif /* !PIL_TIME_H */ +#endif /* !__PIL_TIME_H__ */ diff --git a/source/blender/blenlib/intern/dynamiclist.h b/source/blender/blenlib/intern/dynamiclist.h index 83b5aac963c..64c4a8fd61a 100644 --- a/source/blender/blenlib/intern/dynamiclist.h +++ b/source/blender/blenlib/intern/dynamiclist.h @@ -29,8 +29,8 @@ */ -#ifndef B_DYNAMIC_LIST_H -#define B_DYNAMIC_LIST_H +#ifndef __DYNAMICLIST_H__ +#define __DYNAMICLIST_H__ #define PAGE_SIZE 4 diff --git a/source/blender/blenloader/BLO_readfile.h b/source/blender/blenloader/BLO_readfile.h index d63baca883e..52d06c36bdf 100644 --- a/source/blender/blenloader/BLO_readfile.h +++ b/source/blender/blenloader/BLO_readfile.h @@ -24,8 +24,8 @@ * * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BLO_READFILE_H -#define BLO_READFILE_H +#ifndef __BLO_READFILE_H__ +#define __BLO_READFILE_H__ /** \file BLO_readfile.h * \ingroup blenloader diff --git a/source/blender/blenloader/BLO_runtime.h b/source/blender/blenloader/BLO_runtime.h index 573db5301bc..0a5a7d3a660 100644 --- a/source/blender/blenloader/BLO_runtime.h +++ b/source/blender/blenloader/BLO_runtime.h @@ -26,8 +26,8 @@ * */ -#ifndef BLO_RUNTIME_H -#define BLO_RUNTIME_H +#ifndef __BLO_RUNTIME_H__ +#define __BLO_RUNTIME_H__ /** \file BLO_runtime.h * \ingroup blenloader @@ -47,5 +47,5 @@ struct BlendFileData *BLO_read_runtime(const char *file, struct ReportList *repo } #endif -#endif /* BLO_RUNTIME_H */ +#endif /* __BLO_RUNTIME_H__ */ diff --git a/source/blender/blenloader/BLO_soundfile.h b/source/blender/blenloader/BLO_soundfile.h index 4c8d40b3e69..d2f87139b74 100644 --- a/source/blender/blenloader/BLO_soundfile.h +++ b/source/blender/blenloader/BLO_soundfile.h @@ -24,8 +24,8 @@ * * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BLO_SOUNDFILE_H -#define BLO_SOUNDFILE_H +#ifndef __BLO_SOUNDFILE_H__ +#define __BLO_SOUNDFILE_H__ /** \file BLO_soundfile.h * \ingroup blenloader diff --git a/source/blender/blenloader/BLO_sys_types.h b/source/blender/blenloader/BLO_sys_types.h index 20d211a74c1..9430878a641 100644 --- a/source/blender/blenloader/BLO_sys_types.h +++ b/source/blender/blenloader/BLO_sys_types.h @@ -40,8 +40,8 @@ * */ -#ifndef BLO_SYS_TYPES_H -#define BLO_SYS_TYPES_H +#ifndef __BLO_SYS_TYPES_H__ +#define __BLO_SYS_TYPES_H__ #ifdef __cplusplus extern "C" { diff --git a/source/blender/blenloader/BLO_undofile.h b/source/blender/blenloader/BLO_undofile.h index 0e06cbd9041..f3c16e07c62 100644 --- a/source/blender/blenloader/BLO_undofile.h +++ b/source/blender/blenloader/BLO_undofile.h @@ -26,8 +26,8 @@ * external writefile function prototypes */ -#ifndef BLO_UNDOFILE_H -#define BLO_UNDOFILE_H +#ifndef __BLO_UNDOFILE_H__ +#define __BLO_UNDOFILE_H__ /** \file BLO_undofile.h * \ingroup blenloader diff --git a/source/blender/blenloader/BLO_writefile.h b/source/blender/blenloader/BLO_writefile.h index 1ac5feef119..87b832a070e 100644 --- a/source/blender/blenloader/BLO_writefile.h +++ b/source/blender/blenloader/BLO_writefile.h @@ -25,8 +25,8 @@ * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BLO_WRITEFILE_H -#define BLO_WRITEFILE_H +#ifndef __BLO_WRITEFILE_H__ +#define __BLO_WRITEFILE_H__ /** \file BLO_writefile.h * \ingroup blenloader diff --git a/source/blender/blenloader/intern/readfile.h b/source/blender/blenloader/intern/readfile.h index c7a53555415..511ded0ecdc 100644 --- a/source/blender/blenloader/intern/readfile.h +++ b/source/blender/blenloader/intern/readfile.h @@ -30,8 +30,8 @@ * \ingroup blenloader */ -#ifndef READFILE_H -#define READFILE_H +#ifndef __READFILE_H__ +#define __READFILE_H__ #include "zlib.h" diff --git a/source/blender/blenpluginapi/externdef.h b/source/blender/blenpluginapi/externdef.h index 28239d117cd..fbd81a83272 100644 --- a/source/blender/blenpluginapi/externdef.h +++ b/source/blender/blenpluginapi/externdef.h @@ -30,8 +30,8 @@ * SUCH DAMAGE. */ -#ifndef _EXTERNDEF_H -#define _EXTERNDEF_H +#ifndef __EXTERNDEF_H__ +#define __EXTERNDEF_H__ #ifdef WIN32 #ifdef PLUGIN_INTERN @@ -46,4 +46,4 @@ #define LIBIMPORT extern #endif -#endif /* _EXTERNDEF_H */ +#endif /* __EXTERNDEF_H__ */ diff --git a/source/blender/blenpluginapi/floatpatch.h b/source/blender/blenpluginapi/floatpatch.h index 73fe35cad26..4c9b98d073d 100644 --- a/source/blender/blenpluginapi/floatpatch.h +++ b/source/blender/blenpluginapi/floatpatch.h @@ -30,8 +30,8 @@ * SUCH DAMAGE. */ -#ifndef FLOATPATCH_H -#define FLOATPATCH_H +#ifndef __FLOATPATCH_H__ +#define __FLOATPATCH_H__ /* floating point libs differ at systems... with these defines it comilies at all! */ @@ -88,5 +88,5 @@ #endif -#endif /* FLOATPATCH_H */ +#endif /* __FLOATPATCH_H__ */ diff --git a/source/blender/blenpluginapi/iff.h b/source/blender/blenpluginapi/iff.h index f07e80b36ce..cf235c2f0ca 100644 --- a/source/blender/blenpluginapi/iff.h +++ b/source/blender/blenpluginapi/iff.h @@ -30,8 +30,8 @@ * SUCH DAMAGE. */ -#ifndef IFF_H -#define IFF_H +#ifndef __IFF_H__ +#define __IFF_H__ #include <sys/types.h> #include "util.h" @@ -117,5 +117,5 @@ LIBIMPORT void IMB_rectfill_area(struct ImBuf *ibuf, float *col, int x1, int y1, LIBIMPORT void buf_rectfill_area(unsigned char *rect, float *rectf, int width, int height, const float col[4], int x1, int y1, int x2, int y2); LIBIMPORT void IMB_rectfill_alpha(struct ImBuf *drect, const float value); -#endif /* IFF_H */ +#endif /* __IFF_H__ */ diff --git a/source/blender/blenpluginapi/plugin.h b/source/blender/blenpluginapi/plugin.h index 65569560faf..eb32fe80fa3 100644 --- a/source/blender/blenpluginapi/plugin.h +++ b/source/blender/blenpluginapi/plugin.h @@ -30,8 +30,8 @@ * SUCH DAMAGE. */ -#ifndef PLUGIN_H -#define PLUGIN_H +#ifndef __PLUGIN_H__ +#define __PLUGIN_H__ #include "externdef.h" #include "iff.h" @@ -102,5 +102,5 @@ LIBIMPORT float turbulence(float noisesize, float x, float y, float z, int depth /* hard turbulence */ LIBIMPORT float turbulence1(float noisesize, float x, float y, float z, int depth); -#endif /* PLUGIN_H */ +#endif /* __PLUGIN_H__ */ diff --git a/source/blender/blenpluginapi/util.h b/source/blender/blenpluginapi/util.h index 156e758977d..340201924d7 100644 --- a/source/blender/blenpluginapi/util.h +++ b/source/blender/blenpluginapi/util.h @@ -30,8 +30,8 @@ * SUCH DAMAGE. */ -#ifndef UTIL_H -#define UTIL_H +#ifndef __UTIL_H__ +#define __UTIL_H__ #include <sys/types.h> #include <stdlib.h> @@ -98,5 +98,5 @@ LIBEXPORT void *mallocT(int len, char *str); LIBEXPORT void *callocT(int len, char *str); LIBEXPORT void freeT(void *vmemh); -#endif /* UTIL_H */ +#endif /* __UTIL_H__ */ diff --git a/source/blender/collada/AnimationImporter.h b/source/blender/collada/AnimationImporter.h index 2c3165db122..118a50b0480 100644 --- a/source/blender/collada/AnimationImporter.h +++ b/source/blender/collada/AnimationImporter.h @@ -24,8 +24,8 @@ * \ingroup collada */ -#ifndef __BC_ANIMATIONIMPORTER_H__ -#define __BC_ANIMATIONIMPORTER_H__ +#ifndef __ANIMATIONIMPORTER_H__ +#define __ANIMATIONIMPORTER_H__ #include <map> #include <vector> diff --git a/source/blender/collada/ArmatureImporter.h b/source/blender/collada/ArmatureImporter.h index 343badaca28..0c95ee81272 100644 --- a/source/blender/collada/ArmatureImporter.h +++ b/source/blender/collada/ArmatureImporter.h @@ -24,8 +24,8 @@ * \ingroup collada */ -#ifndef __BC_ARMATUREIMPORTER_H__ -#define __BC_ARMATUREIMPORTER_H__ +#ifndef __ARMATUREIMPORTER_H__ +#define __ARMATUREIMPORTER_H__ #include "COLLADAFWNode.h" #include "COLLADAFWUniqueId.h" diff --git a/source/blender/collada/MeshImporter.h b/source/blender/collada/MeshImporter.h index 3bccc4ed04a..0c2e600121f 100644 --- a/source/blender/collada/MeshImporter.h +++ b/source/blender/collada/MeshImporter.h @@ -24,8 +24,8 @@ * \ingroup collada */ -#ifndef __BC__MESHIMPORTER_H__ -#define __BC__MESHIMPORTER_H__ +#ifndef __MESHIMPORTER_H__ +#define __MESHIMPORTER_H__ #include <map> #include <vector> diff --git a/source/blender/collada/SkinInfo.h b/source/blender/collada/SkinInfo.h index 71b7c71fd90..7befe7168d3 100644 --- a/source/blender/collada/SkinInfo.h +++ b/source/blender/collada/SkinInfo.h @@ -24,8 +24,8 @@ * \ingroup collada */ -#ifndef __BC_SKININFO_H__ -#define __BC_SKININFO_H__ +#ifndef __SKININFO_H__ +#define __SKININFO_H__ #include <map> #include <vector> diff --git a/source/blender/collada/TransformReader.h b/source/blender/collada/TransformReader.h index e1409a9ced8..a08f4438d73 100644 --- a/source/blender/collada/TransformReader.h +++ b/source/blender/collada/TransformReader.h @@ -24,8 +24,8 @@ * \ingroup collada */ -#ifndef __BC_TRANSFORMREADER_H__ -#define __BC_TRANSFORMREADER_H__ +#ifndef __TRANSFORMREADER_H__ +#define __TRANSFORMREADER_H__ #include "COLLADAFWNode.h" #include "COLLADAFWTransformation.h" diff --git a/source/blender/collada/collada.h b/source/blender/collada/collada.h index 161977368db..f8afc797447 100644 --- a/source/blender/collada/collada.h +++ b/source/blender/collada/collada.h @@ -24,8 +24,8 @@ * \ingroup collada */ -#ifndef BLENDER_COLLADA_H -#define BLENDER_COLLADA_H +#ifndef __COLLADA_H__ +#define __COLLADA_H__ struct bContext; struct Scene; diff --git a/source/blender/collada/collada_internal.h b/source/blender/collada/collada_internal.h index 5c3aa49b837..4f555acb882 100644 --- a/source/blender/collada/collada_internal.h +++ b/source/blender/collada/collada_internal.h @@ -24,8 +24,8 @@ * \ingroup collada */ -#ifndef COLLADA_INTERNAL_H -#define COLLADA_INTERNAL_H +#ifndef __COLLADA_INTERNAL_H__ +#define __COLLADA_INTERNAL_H__ #include <string> #include <vector> @@ -98,4 +98,4 @@ extern std::string get_material_id(Material *mat); extern bool has_object_type(Scene* sce, short obtype); -#endif /* COLLADA_INTERNAL_H */ +#endif /* __COLLADA_INTERNAL_H__ */ diff --git a/source/blender/collada/collada_utils.h b/source/blender/collada/collada_utils.h index b95e3bd2824..b0c24152652 100644 --- a/source/blender/collada/collada_utils.h +++ b/source/blender/collada/collada_utils.h @@ -24,8 +24,8 @@ * \ingroup collada */ -#ifndef __BC_UTILS_H__ -#define __BC_UTILS_H__ +#ifndef __COLLADA_UTILS_H__ +#define __COLLADA_UTILS_H__ #include "COLLADAFWMeshPrimitive.h" #include "COLLADAFWGeometry.h" diff --git a/source/blender/editors/animation/anim_intern.h b/source/blender/editors/animation/anim_intern.h index 0ac941e5630..bfc70c79404 100644 --- a/source/blender/editors/animation/anim_intern.h +++ b/source/blender/editors/animation/anim_intern.h @@ -28,8 +28,8 @@ */ -#ifndef ANIM_INTERN_H -#define ANIM_INTERN_H +#ifndef __ANIM_INTERN_H__ +#define __ANIM_INTERN_H__ /* KeyingSets/Keyframing Interface ------------- */ @@ -79,4 +79,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__ diff --git a/source/blender/editors/armature/BIF_generate.h b/source/blender/editors/armature/BIF_generate.h index 311b110a3f6..1d8ee8e2c62 100644 --- a/source/blender/editors/armature/BIF_generate.h +++ b/source/blender/editors/armature/BIF_generate.h @@ -23,8 +23,8 @@ */ -#ifndef BIF_GENERATE_H -#define BIF_GENERATE_H +#ifndef __BIF_GENERATE_H__ +#define __BIF_GENERATE_H__ struct ToolSettings; struct EditBone; @@ -45,4 +45,4 @@ struct EditBone * subdivideArcBy(struct ToolSettings *toolsettings, struct bArma void setBoneRollFromNormal(struct EditBone *bone, float *no, float invmat[][4], float tmat[][3]); -#endif /* BIF_GENERATE_H */ +#endif /* __BIF_GENERATE_H__ */ diff --git a/source/blender/editors/armature/BIF_retarget.h b/source/blender/editors/armature/BIF_retarget.h index ad3d3555250..c878b0c36df 100644 --- a/source/blender/editors/armature/BIF_retarget.h +++ b/source/blender/editors/armature/BIF_retarget.h @@ -23,8 +23,8 @@ */ -#ifndef BIF_RETARGET_H -#define BIF_RETARGET_H +#ifndef __BIF_RETARGET_H__ +#define __BIF_RETARGET_H__ #include "DNA_listBase.h" @@ -168,4 +168,4 @@ void RIG_printArc(struct RigGraph *rg, struct RigArc *arc); void RIG_printGraph(struct RigGraph *rg); void RIG_printArcBones(struct RigArc *arc); -#endif /* BIF_RETARGET_H */ +#endif /* __BIF_RETARGET_H__ */ diff --git a/source/blender/editors/armature/armature_intern.h b/source/blender/editors/armature/armature_intern.h index 40d909380a0..13239f87e65 100644 --- a/source/blender/editors/armature/armature_intern.h +++ b/source/blender/editors/armature/armature_intern.h @@ -28,8 +28,8 @@ * \ingroup edarmature */ -#ifndef ED_ARMATURE_INTERN_H -#define ED_ARMATURE_INTERN_H +#ifndef __ARMATURE_INTERN_H__ +#define __ARMATURE_INTERN_H__ /* internal exports only */ struct wmOperatorType; @@ -219,5 +219,5 @@ struct EditBone *duplicateEditBoneObjects(struct EditBone *curBone, const char * /* editbones is the source list */ void updateDuplicateSubtargetObjects(struct EditBone *dupBone, struct ListBase *editbones, struct Object *src_ob, struct Object *dst_ob); -#endif /* ED_ARMATURE_INTERN_H */ +#endif /* __ARMATURE_INTERN_H__ */ diff --git a/source/blender/editors/armature/meshlaplacian.h b/source/blender/editors/armature/meshlaplacian.h index 6ec67997d24..fbc1596ed0c 100644 --- a/source/blender/editors/armature/meshlaplacian.h +++ b/source/blender/editors/armature/meshlaplacian.h @@ -31,8 +31,8 @@ */ -#ifndef BIF_MESHLAPLACIAN_H -#define BIF_MESHLAPLACIAN_H +#ifndef __MESHLAPLACIAN_H__ +#define __MESHLAPLACIAN_H__ //#define RIGID_DEFORM diff --git a/source/blender/editors/armature/reeb.h b/source/blender/editors/armature/reeb.h index 0080bbec120..b925aea510a 100644 --- a/source/blender/editors/armature/reeb.h +++ b/source/blender/editors/armature/reeb.h @@ -25,8 +25,8 @@ */ -#ifndef REEB_H_ -#define REEB_H_ +#ifndef __REEB_H__ +#define __REEB_H__ #define WITH_BF_REEB @@ -203,4 +203,4 @@ void REEB_exportGraph(ReebGraph *rg, int count); void REEB_draw(void); -#endif /*REEB_H_*/ +#endif /*__REEB_H__*/ diff --git a/source/blender/editors/curve/curve_intern.h b/source/blender/editors/curve/curve_intern.h index 2014345e163..0cc47774207 100644 --- a/source/blender/editors/curve/curve_intern.h +++ b/source/blender/editors/curve/curve_intern.h @@ -29,8 +29,8 @@ */ -#ifndef ED_CURVE_INTERN_H -#define ED_CURVE_INTERN_H +#ifndef __CURVE_INTERN_H__ +#define __CURVE_INTERN_H__ /* internal exports only */ struct wmOperatorType; diff --git a/source/blender/editors/gpencil/gpencil_intern.h b/source/blender/editors/gpencil/gpencil_intern.h index 8000af54f53..b88723d8a3c 100644 --- a/source/blender/editors/gpencil/gpencil_intern.h +++ b/source/blender/editors/gpencil/gpencil_intern.h @@ -28,8 +28,8 @@ * \ingroup edgpencil */ -#ifndef ED_GPENCIL_INTERN_H -#define ED_GPENCIL_INTERN_H +#ifndef __GPENCIL_INTERN_H__ +#define __GPENCIL_INTERN_H__ /* internal exports only */ @@ -117,5 +117,5 @@ typedef enum ACTCONT_TYPES { -#endif /* ED_GPENCIL_INTERN_H */ +#endif /* __GPENCIL_INTERN_H__ */ diff --git a/source/blender/editors/include/BIF_gl.h b/source/blender/editors/include/BIF_gl.h index 940a5866fcd..d34e6f74b4c 100644 --- a/source/blender/editors/include/BIF_gl.h +++ b/source/blender/editors/include/BIF_gl.h @@ -30,8 +30,8 @@ * \ingroup editorui */ -#ifndef BIF_GL_H -#define BIF_GL_H +#ifndef __BIF_GL_H__ +#define __BIF_GL_H__ #include "GL/glew.h" @@ -50,5 +50,5 @@ #define glMultMatrixf(x) glMultMatrixf( (float *)(x)) #define glLoadMatrixf(x) glLoadMatrixf( (float *)(x)) -#endif /* #ifdef BIF_GL_H */ +#endif /* #ifdef __BIF_GL_H__ */ diff --git a/source/blender/editors/include/BIF_glutil.h b/source/blender/editors/include/BIF_glutil.h index 33e9192a23e..b1114eba141 100644 --- a/source/blender/editors/include/BIF_glutil.h +++ b/source/blender/editors/include/BIF_glutil.h @@ -27,8 +27,8 @@ * \ingroup editorui */ -#ifndef BIF_GLUTIL_H -#define BIF_GLUTIL_H +#ifndef __BIF_GLUTIL_H__ +#define __BIF_GLUTIL_H__ struct rcti; struct rctf; @@ -216,5 +216,5 @@ typedef struct bglMats { } bglMats; void bgl_get_mats(bglMats *mats); -#endif /* BIF_GLUTIL_H */ +#endif /* __BIF_GLUTIL_H__ */ diff --git a/source/blender/editors/include/ED_anim_api.h b/source/blender/editors/include/ED_anim_api.h index 6b449f68e1d..c75ec259504 100644 --- a/source/blender/editors/include/ED_anim_api.h +++ b/source/blender/editors/include/ED_anim_api.h @@ -28,8 +28,8 @@ * \ingroup editors */ -#ifndef ED_ANIM_API_H -#define ED_ANIM_API_H +#ifndef __ED_ANIM_API_H__ +#define __ED_ANIM_API_H__ struct ID; struct ListBase; @@ -605,5 +605,5 @@ void ED_operatormacros_action(void); /* ************************************************ */ -#endif /* ED_ANIM_API_H */ +#endif /* __ED_ANIM_API_H__ */ diff --git a/source/blender/editors/include/ED_armature.h b/source/blender/editors/include/ED_armature.h index d345f16b768..544250fcd2e 100644 --- a/source/blender/editors/include/ED_armature.h +++ b/source/blender/editors/include/ED_armature.h @@ -27,8 +27,8 @@ * \ingroup editors */ -#ifndef ED_ARMATURE_H -#define ED_ARMATURE_H +#ifndef __ED_ARMATURE_H__ +#define __ED_ARMATURE_H__ #ifdef __cplusplus extern "C" { @@ -182,7 +182,7 @@ void mesh_deform_bind(struct Scene *scene, } #endif -#endif /* ED_ARMATURE_H */ +#endif /* __ED_ARMATURE_H__ */ diff --git a/source/blender/editors/include/ED_clip.h b/source/blender/editors/include/ED_clip.h index 7d36159f47e..5e8ef618a42 100644 --- a/source/blender/editors/include/ED_clip.h +++ b/source/blender/editors/include/ED_clip.h @@ -28,8 +28,8 @@ * \ingroup editors */ -#ifndef ED_MOVIECLIP_H -#define ED_MOVIECLIP_H +#ifndef __ED_CLIP_H__ +#define __ED_CLIP_H__ struct ARegion; struct bContext; diff --git a/source/blender/editors/include/ED_curve.h b/source/blender/editors/include/ED_curve.h index 7e7d60fdea8..700ff39fdba 100644 --- a/source/blender/editors/include/ED_curve.h +++ b/source/blender/editors/include/ED_curve.h @@ -28,8 +28,8 @@ * \ingroup editors */ -#ifndef ED_CURVE_H -#define ED_CURVE_H +#ifndef __ED_CURVE_H__ +#define __ED_CURVE_H__ struct Base; struct bContext; @@ -95,5 +95,5 @@ int ED_curve_actSelection(struct Curve *cu, float center[3]); /* debug only */ void printknots(struct Object *obedit); -#endif /* ED_CURVE_H */ +#endif /* __ED_CURVE_H__ */ diff --git a/source/blender/editors/include/ED_datafiles.h b/source/blender/editors/include/ED_datafiles.h index 2c4472c4636..9fe2fe685a0 100644 --- a/source/blender/editors/include/ED_datafiles.h +++ b/source/blender/editors/include/ED_datafiles.h @@ -28,8 +28,8 @@ * \ingroup editors */ -#ifndef ED_DATAFILES_H -#define ED_DATAFILES_H +#ifndef __ED_DATAFILES_H__ +#define __ED_DATAFILES_H__ /* Datafiles embedded in Blender */ @@ -142,5 +142,5 @@ extern int datatoc_vertexdraw_png_size; extern char datatoc_vertexdraw_png[]; -#endif /* ED_DATAFILES_H */ +#endif /* __ED_DATAFILES_H__ */ diff --git a/source/blender/editors/include/ED_fileselect.h b/source/blender/editors/include/ED_fileselect.h index dc362f9f99b..7cf750f5a9b 100644 --- a/source/blender/editors/include/ED_fileselect.h +++ b/source/blender/editors/include/ED_fileselect.h @@ -28,8 +28,8 @@ * \ingroup editors */ -#ifndef ED_FILES_H -#define ED_FILES_H +#ifndef __ED_FILESELECT_H__ +#define __ED_FILESELECT_H__ struct SpaceFile; struct ARegion; @@ -106,5 +106,5 @@ void ED_fileselect_exit(struct bContext *C, struct SpaceFile *sfile); int ED_file_extension_icon(const char *relname); -#endif /* ED_FILES_H */ +#endif /* __ED_FILESELECT_H__ */ diff --git a/source/blender/editors/include/ED_fluidsim.h b/source/blender/editors/include/ED_fluidsim.h index d47ba2bfba9..54acf73aacd 100644 --- a/source/blender/editors/include/ED_fluidsim.h +++ b/source/blender/editors/include/ED_fluidsim.h @@ -32,8 +32,8 @@ * \ingroup editors */ -#ifndef ED_FLUIDSIM_H -#define ED_FLUIDSIM_H +#ifndef __ED_FLUIDSIM_H__ +#define __ED_FLUIDSIM_H__ struct Object; struct FluidsimSettings; @@ -48,4 +48,4 @@ void fluidsimSettingsFree(struct FluidsimSettings* sb); /* duplicate internal data */ struct FluidsimSettings* fluidsimSettingsCopy(struct FluidsimSettings* sb); -#endif /* ED_FLUIDSIM_H */ +#endif /* __ED_FLUIDSIM_H__ */ diff --git a/source/blender/editors/include/ED_gpencil.h b/source/blender/editors/include/ED_gpencil.h index a640b5c911c..ce434493137 100644 --- a/source/blender/editors/include/ED_gpencil.h +++ b/source/blender/editors/include/ED_gpencil.h @@ -27,8 +27,8 @@ * \ingroup editors */ -#ifndef ED_GPENCIL_H -#define ED_GPENCIL_H +#ifndef __ED_GPENCIL_H__ +#define __ED_GPENCIL_H__ struct ListBase; struct bContext; @@ -109,4 +109,4 @@ void mirror_gplayer_frames(struct bGPDlayer *gpl, short mode); int ED_gpencil_session_active(void); int ED_undo_gpencil_step(struct bContext *C, int step, const char *name); -#endif /* ED_GPENCIL_H */ +#endif /* __ED_GPENCIL_H__ */ diff --git a/source/blender/editors/include/ED_image.h b/source/blender/editors/include/ED_image.h index 05cde05f25c..b95615ce365 100644 --- a/source/blender/editors/include/ED_image.h +++ b/source/blender/editors/include/ED_image.h @@ -27,8 +27,8 @@ * \ingroup editors */ -#ifndef ED_IMAGE_H -#define ED_IMAGE_H +#ifndef __ED_IMAGE_H__ +#define __ED_IMAGE_H__ struct SpaceImage; struct Main; @@ -70,5 +70,5 @@ void ED_image_update_frame(const struct Main *mainp, int cfra); void ED_image_draw_info(struct ARegion *ar, int color_manage, int channels, int x, int y, const unsigned char cp[4], const float fp[4], int *zp, float *zpf); -#endif /* ED_IMAGE_H */ +#endif /* __ED_IMAGE_H__ */ diff --git a/source/blender/editors/include/ED_info.h b/source/blender/editors/include/ED_info.h index 7044ab63cad..6970abaa633 100644 --- a/source/blender/editors/include/ED_info.h +++ b/source/blender/editors/include/ED_info.h @@ -24,11 +24,11 @@ * \ingroup editors */ -#ifndef ED_INFO_H -#define ED_INFO_H +#ifndef __ED_INFO_H__ +#define __ED_INFO_H__ /* info_stats.c */ void ED_info_stats_clear(struct Scene *scene); const char *ED_info_stats_string(struct Scene *scene); -#endif /* ED_INFO_H */ +#endif /* __ED_INFO_H__ */ diff --git a/source/blender/editors/include/ED_keyframes_draw.h b/source/blender/editors/include/ED_keyframes_draw.h index 91723a1a33f..7f68325e5ee 100644 --- a/source/blender/editors/include/ED_keyframes_draw.h +++ b/source/blender/editors/include/ED_keyframes_draw.h @@ -29,8 +29,8 @@ * \ingroup editors */ -#ifndef ED_KEYFRAMES_DRAW_H -#define ED_KEYFRAMES_DRAW_H +#ifndef __ED_KEYFRAMES_DRAW_H__ +#define __ED_KEYFRAMES_DRAW_H__ struct bAnimContext; struct AnimData; @@ -150,5 +150,5 @@ short compare_ab_cfraPtr(void *node, void *data); /* Checks if ActKeyBlock can be used (i.e. drawn/used to detect "holds") */ short actkeyblock_is_valid(ActKeyBlock *ab, struct DLRBT_Tree *keys); -#endif /* ED_KEYFRAMES_DRAW_H */ +#endif /* __ED_KEYFRAMES_DRAW_H__ */ diff --git a/source/blender/editors/include/ED_keyframes_edit.h b/source/blender/editors/include/ED_keyframes_edit.h index 5881e8c4bfe..7ba37b49f85 100644 --- a/source/blender/editors/include/ED_keyframes_edit.h +++ b/source/blender/editors/include/ED_keyframes_edit.h @@ -28,8 +28,8 @@ * \ingroup editors */ -#ifndef ED_KEYFRAMES_EDIT_H -#define ED_KEYFRAMES_EDIT_H +#ifndef __ED_KEYFRAMES_EDIT_H__ +#define __ED_KEYFRAMES_EDIT_H__ struct bAnimContext; struct bAnimListElem; @@ -254,4 +254,4 @@ short paste_animedit_keys(struct bAnimContext *ac, ListBase *anim_data, /* ************************************************ */ -#endif /* ED_KEYFRAMES_EDIT_H */ +#endif /* __ED_KEYFRAMES_EDIT_H__ */ diff --git a/source/blender/editors/include/ED_keyframing.h b/source/blender/editors/include/ED_keyframing.h index eda84d0e7a4..63c0511e6b3 100644 --- a/source/blender/editors/include/ED_keyframing.h +++ b/source/blender/editors/include/ED_keyframing.h @@ -27,8 +27,8 @@ * \ingroup editors */ -#ifndef ED_KEYFRAMING_H -#define ED_KEYFRAMING_H +#ifndef __ED_KEYFRAMING_H__ +#define __ED_KEYFRAMING_H__ #ifdef __cplusplus extern "C" { @@ -330,4 +330,4 @@ int ED_autokeyframe_pchan(struct bContext *C, struct Scene *scene, struct Object } #endif -#endif /* ED_KEYFRAMING_H */ +#endif /* __ED_KEYFRAMING_H__ */ diff --git a/source/blender/editors/include/ED_logic.h b/source/blender/editors/include/ED_logic.h index ce1f2b8faac..71a5552ae26 100644 --- a/source/blender/editors/include/ED_logic.h +++ b/source/blender/editors/include/ED_logic.h @@ -27,10 +27,10 @@ * \ingroup editors */ -#ifndef ED_LOGIC_H -#define ED_LOGIC_H +#ifndef __ED_LOGIC_H__ +#define __ED_LOGIC_H__ /* logic_ops.c */ void ED_operatortypes_logic(void); -#endif /* ED_LOGIC_H */ +#endif /* __ED_LOGIC_H__ */ diff --git a/source/blender/editors/include/ED_markers.h b/source/blender/editors/include/ED_markers.h index 30a0d47eda2..c0b5ba6ecf8 100644 --- a/source/blender/editors/include/ED_markers.h +++ b/source/blender/editors/include/ED_markers.h @@ -28,8 +28,8 @@ * \ingroup editors */ -#ifndef ED_MARKERS_H -#define ED_MARKERS_H +#ifndef __ED_MARKERS_H__ +#define __ED_MARKERS_H__ struct wmKeyConfig; struct wmKeyMap; @@ -77,5 +77,5 @@ void ED_marker_keymap_animedit_conflictfree(struct wmKeyMap *keymap); /* debugging only */ void debug_markers_print_list(struct ListBase *markers); -#endif /* ED_MARKERS_H */ +#endif /* __ED_MARKERS_H__ */ diff --git a/source/blender/editors/include/ED_mball.h b/source/blender/editors/include/ED_mball.h index 259004864fb..89917f09284 100644 --- a/source/blender/editors/include/ED_mball.h +++ b/source/blender/editors/include/ED_mball.h @@ -28,8 +28,8 @@ * \ingroup editors */ -#ifndef _ED_MBALL_H_ -#define _ED_MBALL_H_ +#ifndef __ED_MBALL_H__ +#define __ED_MBALL_H__ struct bContext; struct Object; diff --git a/source/blender/editors/include/ED_mesh.h b/source/blender/editors/include/ED_mesh.h index 160e3eea6cc..6e289fb5a2a 100644 --- a/source/blender/editors/include/ED_mesh.h +++ b/source/blender/editors/include/ED_mesh.h @@ -28,8 +28,8 @@ * \ingroup editors */ -#ifndef ED_MESH_H -#define ED_MESH_H +#ifndef __ED_MESH_H__ +#define __ED_MESH_H__ #ifdef __cplusplus extern "C" { @@ -268,5 +268,5 @@ void ED_mesh_mirrtopo_free(MirrTopoStore_t *mesh_topo_store); } #endif -#endif /* ED_MESH_H */ +#endif /* __ED_MESH_H__ */ diff --git a/source/blender/editors/include/ED_node.h b/source/blender/editors/include/ED_node.h index 18bb4975da9..192236b7cb8 100644 --- a/source/blender/editors/include/ED_node.h +++ b/source/blender/editors/include/ED_node.h @@ -28,8 +28,8 @@ * \ingroup editors */ -#ifndef ED_NODE_H -#define ED_NODE_H +#ifndef __ED_NODE_H__ +#define __ED_NODE_H__ struct ID; struct Main; @@ -63,5 +63,5 @@ void ED_node_set_active(struct Main *bmain, struct bNodeTree *ntree, struct bNod /* node ops.c */ void ED_operatormacros_node(void); -#endif /* ED_NODE_H */ +#endif /* __ED_NODE_H__ */ diff --git a/source/blender/editors/include/ED_numinput.h b/source/blender/editors/include/ED_numinput.h index e2387c3e9dd..f103b07d09c 100644 --- a/source/blender/editors/include/ED_numinput.h +++ b/source/blender/editors/include/ED_numinput.h @@ -24,8 +24,8 @@ * \ingroup editors */ -#ifndef ED_NUMINPUT_H -#define ED_NUMINPUT_H +#ifndef __ED_NUMINPUT_H__ +#define __ED_NUMINPUT_H__ typedef struct NumInput { diff --git a/source/blender/editors/include/ED_object.h b/source/blender/editors/include/ED_object.h index f3e780d715e..c808e63d320 100644 --- a/source/blender/editors/include/ED_object.h +++ b/source/blender/editors/include/ED_object.h @@ -28,8 +28,8 @@ * \ingroup editors */ -#ifndef ED_OBJECT_H -#define ED_OBJECT_H +#ifndef __ED_OBJECT_H__ +#define __ED_OBJECT_H__ #ifdef __cplusplus extern "C" { @@ -178,5 +178,5 @@ int ED_object_modifier_copy(struct ReportList *reports, struct Object *ob, struc } #endif -#endif /* ED_OBJECT_H */ +#endif /* __ED_OBJECT_H__ */ diff --git a/source/blender/editors/include/ED_particle.h b/source/blender/editors/include/ED_particle.h index 3035aa44735..1c7f5cf0641 100644 --- a/source/blender/editors/include/ED_particle.h +++ b/source/blender/editors/include/ED_particle.h @@ -30,8 +30,8 @@ * \ingroup editors */ -#ifndef ED_PARTICLE_H -#define ED_PARTICLE_H +#ifndef __ED_PARTICLE_H__ +#define __ED_PARTICLE_H__ struct bContext; struct Object; @@ -74,5 +74,5 @@ int PE_undo_valid(struct Scene *scene); void PE_undo_number(struct Scene *scene, int nr); const char *PE_undo_get_name(struct Scene *scene, int nr, int *active); -#endif /* ED_PARTICLE_H */ +#endif /* __ED_PARTICLE_H__ */ diff --git a/source/blender/editors/include/ED_physics.h b/source/blender/editors/include/ED_physics.h index eadd1566671..6c885b9336f 100644 --- a/source/blender/editors/include/ED_physics.h +++ b/source/blender/editors/include/ED_physics.h @@ -30,8 +30,8 @@ * \ingroup editors */ -#ifndef ED_PHYSICS_H -#define ED_PHYSICS_H +#ifndef __ED_PHYSICS_H__ +#define __ED_PHYSICS_H__ struct wmKeyConfig; @@ -44,5 +44,5 @@ int PE_poll_view3d(struct bContext *C); void ED_operatortypes_physics(void); void ED_keymap_physics(struct wmKeyConfig *keyconf); -#endif /* ED_PHYSICS_H */ +#endif /* __ED_PHYSICS_H__ */ diff --git a/source/blender/editors/include/ED_render.h b/source/blender/editors/include/ED_render.h index 73776f7234b..c9e00b0296a 100644 --- a/source/blender/editors/include/ED_render.h +++ b/source/blender/editors/include/ED_render.h @@ -25,8 +25,8 @@ * \ingroup editors */ -#ifndef ED_RENDER_H -#define ED_RENDER_H +#ifndef __ED_RENDER_H__ +#define __ED_RENDER_H__ #include "DNA_vec_types.h" diff --git a/source/blender/editors/include/ED_screen.h b/source/blender/editors/include/ED_screen.h index e0ff5cddf85..252eb790b2a 100644 --- a/source/blender/editors/include/ED_screen.h +++ b/source/blender/editors/include/ED_screen.h @@ -28,8 +28,8 @@ * \ingroup editors */ -#ifndef ED_SCREEN_H -#define ED_SCREEN_H +#ifndef __ED_SCREEN_H__ +#define __ED_SCREEN_H__ #include "DNA_screen_types.h" #include "DNA_space_types.h" @@ -181,5 +181,5 @@ int ED_operator_posemode(struct bContext *C); #define ED_KEYMAP_GPENCIL 32 #define ED_KEYMAP_HEADER 64 -#endif /* ED_SCREEN_H */ +#endif /* __ED_SCREEN_H__ */ diff --git a/source/blender/editors/include/ED_screen_types.h b/source/blender/editors/include/ED_screen_types.h index 544d366c926..51699d095ae 100644 --- a/source/blender/editors/include/ED_screen_types.h +++ b/source/blender/editors/include/ED_screen_types.h @@ -28,8 +28,8 @@ * \ingroup editors */ -#ifndef ED_SCREEN_TYPES_H__ -#define ED_SCREEN_TYPES_H__ +#ifndef __ED_SCREEN_TYPES_H__ +#define __ED_SCREEN_TYPES_H__ /* ----------------------------------------------------- */ @@ -100,4 +100,4 @@ typedef struct AZone { #define AZONE_AREA 1 #define AZONE_REGION 2 -#endif /* ED_SCREEN_TYPES_H__ */ +#endif /* __ED_SCREEN_TYPES_H__ */ diff --git a/source/blender/editors/include/ED_sculpt.h b/source/blender/editors/include/ED_sculpt.h index bd746e36ef4..9cb32c31f5b 100644 --- a/source/blender/editors/include/ED_sculpt.h +++ b/source/blender/editors/include/ED_sculpt.h @@ -27,8 +27,8 @@ * \ingroup editors */ -#ifndef ED_SCULPT_H -#define ED_SCULPT_H +#ifndef __ED_SCULPT_H__ +#define __ED_SCULPT_H__ struct ARegion; struct bContext; diff --git a/source/blender/editors/include/ED_sequencer.h b/source/blender/editors/include/ED_sequencer.h index da2fce2596b..abeb00c301f 100644 --- a/source/blender/editors/include/ED_sequencer.h +++ b/source/blender/editors/include/ED_sequencer.h @@ -24,9 +24,9 @@ * \ingroup editors */ -#ifndef ED_SEQUENCER_H -#define ED_SEQUENCER_H +#ifndef __ED_SEQUENCER_H__ +#define __ED_SEQUENCER_H__ #define SEQ_ZOOM_FAC(szoom) ((szoom) > 0.0f)? (szoom) : ((szoom) == 0.0f)? (1.0f) : (-1.0f/(szoom)) -#endif /* ED_SEQUENCER_H */ +#endif /* __ED_SEQUENCER_H__ */ diff --git a/source/blender/editors/include/ED_sound.h b/source/blender/editors/include/ED_sound.h index a4e90094e19..d3e7502bb99 100644 --- a/source/blender/editors/include/ED_sound.h +++ b/source/blender/editors/include/ED_sound.h @@ -28,10 +28,10 @@ * \ingroup editors */ -#ifndef ED_SOUND_H -#define ED_SOUND_H +#ifndef __ED_SOUND_H__ +#define __ED_SOUND_H__ void ED_operatortypes_sound(void); -#endif /* ED_SOUND_H */ +#endif /* __ED_SOUND_H__ */ diff --git a/source/blender/editors/include/ED_space_api.h b/source/blender/editors/include/ED_space_api.h index b5a1ca193db..0d6e640c7bf 100644 --- a/source/blender/editors/include/ED_space_api.h +++ b/source/blender/editors/include/ED_space_api.h @@ -28,8 +28,8 @@ * \ingroup editors */ -#ifndef ED_SPACE_API_H -#define ED_SPACE_API_H +#ifndef __ED_SPACE_API_H__ +#define __ED_SPACE_API_H__ struct ARegionType; struct bContext; @@ -73,5 +73,5 @@ void ED_region_draw_cb_draw(const struct bContext *, struct ARegion *, int); void ED_region_draw_cb_exit(struct ARegionType *, void *); void *ED_region_draw_cb_customdata(void *handle); -#endif /* ED_SPACE_API_H */ +#endif /* __ED_SPACE_API_H__ */ diff --git a/source/blender/editors/include/ED_text.h b/source/blender/editors/include/ED_text.h index da01e25f4d9..9a36cb3d6ab 100644 --- a/source/blender/editors/include/ED_text.h +++ b/source/blender/editors/include/ED_text.h @@ -27,12 +27,12 @@ * \ingroup editors */ -#ifndef ED_TEXT_H -#define ED_TEXT_H +#ifndef __ED_TEXT_H__ +#define __ED_TEXT_H__ struct bContext; void ED_text_undo_step(struct bContext *C, int step); -#endif /* ED_TEXT_H */ +#endif /* __ED_TEXT_H__ */ diff --git a/source/blender/editors/include/ED_transform.h b/source/blender/editors/include/ED_transform.h index 2ca3e2bfe7f..36bda11b1d4 100644 --- a/source/blender/editors/include/ED_transform.h +++ b/source/blender/editors/include/ED_transform.h @@ -29,8 +29,8 @@ * \ingroup editors */ -#ifndef ED_TRANSFORM_H -#define ED_TRANSFORM_H +#ifndef __ED_TRANSFORM_H__ +#define __ED_TRANSFORM_H__ /* ******************* Registration Function ********************** */ diff --git a/source/blender/editors/include/ED_types.h b/source/blender/editors/include/ED_types.h index 6ea45c995c9..c4104472a82 100644 --- a/source/blender/editors/include/ED_types.h +++ b/source/blender/editors/include/ED_types.h @@ -28,8 +28,8 @@ * \ingroup editors */ -#ifndef ED_TYPES_H -#define ED_TYPES_H +#ifndef __ED_TYPES_H__ +#define __ED_TYPES_H__ /* **************** GENERAL EDITOR-WIDE TYPES AND DEFINES ************************** */ @@ -44,5 +44,5 @@ -#endif /* ED_TYPES_H */ +#endif /* __ED_TYPES_H__ */ diff --git a/source/blender/editors/include/ED_util.h b/source/blender/editors/include/ED_util.h index c08e5eabbd3..d082f3449fa 100644 --- a/source/blender/editors/include/ED_util.h +++ b/source/blender/editors/include/ED_util.h @@ -28,8 +28,8 @@ * \ingroup editors */ -#ifndef ED_UTIL_H -#define ED_UTIL_H +#ifndef __ED_UTIL_H__ +#define __ED_UTIL_H__ struct Scene; struct Object; @@ -93,5 +93,5 @@ int GetButStringLength(const char *str); /* where else to go ? */ void unpack_menu(struct bContext *C, const char *opname, const char *id_name, const char *abs_name, const char *folder, struct PackedFile *pf); -#endif /* ED_UTIL_H */ +#endif /* __ED_UTIL_H__ */ diff --git a/source/blender/editors/include/ED_uvedit.h b/source/blender/editors/include/ED_uvedit.h index bc8a12c97cc..4d8bceb044f 100644 --- a/source/blender/editors/include/ED_uvedit.h +++ b/source/blender/editors/include/ED_uvedit.h @@ -27,8 +27,8 @@ * \ingroup editors */ -#ifndef ED_UVEDIT_H -#define ED_UVEDIT_H +#ifndef __ED_UVEDIT_H__ +#define __ED_UVEDIT_H__ struct ARegionType; struct EditFace; @@ -86,5 +86,5 @@ void draw_uvedit_main(struct SpaceImage *sima, struct ARegion *ar, struct Scene /* uvedit_buttons.c */ void ED_uvedit_buttons_register(struct ARegionType *art); -#endif /* ED_UVEDIT_H */ +#endif /* __ED_UVEDIT_H__ */ diff --git a/source/blender/editors/include/ED_view3d.h b/source/blender/editors/include/ED_view3d.h index 7616e25cbe9..63c03cd2963 100644 --- a/source/blender/editors/include/ED_view3d.h +++ b/source/blender/editors/include/ED_view3d.h @@ -28,8 +28,8 @@ * \ingroup editors */ -#ifndef ED_VIEW3D_H -#define ED_VIEW3D_H +#ifndef __ED_VIEW3D_H__ +#define __ED_VIEW3D_H__ /* ********* exports for space_view3d/ module ********** */ struct ARegion; @@ -308,4 +308,4 @@ void ED_view3d_operator_properties_viewmat(struct wmOperatorType *ot); void ED_view3d_operator_properties_viewmat_set(struct bContext *C, struct wmOperator *op); void ED_view3d_operator_properties_viewmat_get(struct wmOperator *op, int *winx, int *winy, float persmat[4][4]); -#endif /* ED_VIEW3D_H */ +#endif /* __ED_VIEW3D_H__ */ diff --git a/source/blender/editors/include/UI_icons.h b/source/blender/editors/include/UI_icons.h index f102ecb0d08..f35af356c94 100644 --- a/source/blender/editors/include/UI_icons.h +++ b/source/blender/editors/include/UI_icons.h @@ -29,8 +29,8 @@ */ /* Note: this is included twice with different #defines for DEF_ICON - once from UI_resources.h for the internal icon enum and - once for interface_api.c for the definition of the RNA enum for the icons */ + * once from UI_resources.h for the internal icon enum and + * once for interface_api.c for the definition of the RNA enum for the icons */ /* ICON_ prefix added */ DEF_ICON(NONE) diff --git a/source/blender/editors/include/UI_interface.h b/source/blender/editors/include/UI_interface.h index 3f907004931..5eafdc27e68 100644 --- a/source/blender/editors/include/UI_interface.h +++ b/source/blender/editors/include/UI_interface.h @@ -29,8 +29,8 @@ * \ingroup editorui */ -#ifndef UI_INTERFACE_H -#define UI_INTERFACE_H +#ifndef __UI_INTERFACE_H__ +#define __UI_INTERFACE_H__ #include "BLO_sys_types.h" /* size_t */ #include "RNA_types.h" @@ -838,5 +838,5 @@ void UI_template_fix_linking(void); int UI_editsource_enable_check(void); void UI_editsource_active_but_test(uiBut *but); -#endif /* UI_INTERFACE_H */ +#endif /* __UI_INTERFACE_H__ */ diff --git a/source/blender/editors/include/UI_interface_icons.h b/source/blender/editors/include/UI_interface_icons.h index e5ad51169a8..a1b42ac39c2 100644 --- a/source/blender/editors/include/UI_interface_icons.h +++ b/source/blender/editors/include/UI_interface_icons.h @@ -29,8 +29,8 @@ * \ingroup editorui */ -#ifndef UI_INTERFACE_ICONS_H -#define UI_INTERFACE_ICONS_H +#ifndef __UI_INTERFACE_ICONS_H__ +#define __UI_INTERFACE_ICONS_H__ struct Image; struct ImBuf; @@ -75,4 +75,4 @@ struct ListBase *UI_iconfile_list(void); int UI_iconfile_get_index(const char *filename); -#endif /* UI_INTERFACE_ICONS_H */ +#endif /* __UI_INTERFACE_ICONS_H__ */ diff --git a/source/blender/editors/include/UI_resources.h b/source/blender/editors/include/UI_resources.h index d755b17bc98..f676dcbdff2 100644 --- a/source/blender/editors/include/UI_resources.h +++ b/source/blender/editors/include/UI_resources.h @@ -30,8 +30,8 @@ * \ingroup editorui */ -#ifndef UI_RESOURCES_H -#define UI_RESOURCES_H +#ifndef __UI_RESOURCES_H__ +#define __UI_RESOURCES_H__ /* elubie: TODO: move the typedef for icons to UI_interface_icons.h */ /* and add/replace include of UI_resources.h by UI_interface_icons.h */ diff --git a/source/blender/editors/include/UI_view2d.h b/source/blender/editors/include/UI_view2d.h index 7ff27a5bbde..436f268d1bf 100644 --- a/source/blender/editors/include/UI_view2d.h +++ b/source/blender/editors/include/UI_view2d.h @@ -31,8 +31,8 @@ * \ingroup editorui */ -#ifndef UI_VIEW2D_H -#define UI_VIEW2D_H +#ifndef __UI_VIEW2D_H__ +#define __UI_VIEW2D_H__ /* ------------------------------------------ */ /* Settings and Defines: */ @@ -201,5 +201,5 @@ void UI_view2d_text_cache_draw(struct ARegion *ar); void UI_view2d_operatortypes(void); void UI_view2d_keymap(struct wmKeyConfig *keyconf); -#endif /* UI_VIEW2D_H */ +#endif /* __UI_VIEW2D_H__ */ diff --git a/source/blender/editors/interface/interface_intern.h b/source/blender/editors/interface/interface_intern.h index 2d8de475c4b..d324018e4ba 100644 --- a/source/blender/editors/interface/interface_intern.h +++ b/source/blender/editors/interface/interface_intern.h @@ -30,8 +30,8 @@ */ -#ifndef INTERFACE_H -#define INTERFACE_H +#ifndef __INTERFACE_INTERN_H__ +#define __INTERFACE_INTERN_H__ #include "UI_resources.h" #include "RNA_types.h" diff --git a/source/blender/editors/mesh/mesh_intern.h b/source/blender/editors/mesh/mesh_intern.h index 91cba8a482b..21d615e52d5 100644 --- a/source/blender/editors/mesh/mesh_intern.h +++ b/source/blender/editors/mesh/mesh_intern.h @@ -32,8 +32,8 @@ /* Internal for editmesh_xxxx.c functions */ -#ifndef MESH_INTERN_H -#define MESH_INTERN_H +#ifndef __MESH_INTERN_H__ +#define __MESH_INTERN_H__ struct bContext; struct wmOperatorType; @@ -261,5 +261,5 @@ 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__ diff --git a/source/blender/editors/metaball/mball_intern.h b/source/blender/editors/metaball/mball_intern.h index 1cb4c19fc72..0329f8e5bfa 100644 --- a/source/blender/editors/metaball/mball_intern.h +++ b/source/blender/editors/metaball/mball_intern.h @@ -29,8 +29,8 @@ */ -#ifndef ED_MBALL_INTERN_H -#define ED_MBALL_INTERN_H +#ifndef __MBALL_INTERN_H__ +#define __MBALL_INTERN_H__ #include "DNA_object_types.h" diff --git a/source/blender/editors/object/object_intern.h b/source/blender/editors/object/object_intern.h index 7f416feb0d5..73c5c50f448 100644 --- a/source/blender/editors/object/object_intern.h +++ b/source/blender/editors/object/object_intern.h @@ -28,8 +28,8 @@ * \ingroup edobj */ -#ifndef ED_OBJECT_INTERN_H -#define ED_OBJECT_INTERN_H +#ifndef __OBJECT_INTERN_H__ +#define __OBJECT_INTERN_H__ struct wmOperatorType; struct KeyBlock; @@ -225,5 +225,5 @@ void OBJECT_OT_group_remove(struct wmOperatorType *ot); /* object_bake.c */ void OBJECT_OT_bake_image(wmOperatorType *ot); -#endif /* ED_OBJECT_INTERN_H */ +#endif /* __OBJECT_INTERN_H__ */ diff --git a/source/blender/editors/physics/physics_intern.h b/source/blender/editors/physics/physics_intern.h index db6d63f6396..75779cf6102 100644 --- a/source/blender/editors/physics/physics_intern.h +++ b/source/blender/editors/physics/physics_intern.h @@ -30,8 +30,8 @@ */ -#ifndef ED_PHYSICS_INTERN_H -#define ED_PHYSICS_INTERN_H +#ifndef __PHYSICS_INTERN_H__ +#define __PHYSICS_INTERN_H__ struct wmOperatorType; @@ -105,5 +105,5 @@ void PTCACHE_OT_bake_from_cache(struct wmOperatorType *ot); void PTCACHE_OT_add(struct wmOperatorType *ot); void PTCACHE_OT_remove(struct wmOperatorType *ot); -#endif /* ED_PHYSICS_INTERN_H */ +#endif /* __PHYSICS_INTERN_H__ */ diff --git a/source/blender/editors/render/render_intern.h b/source/blender/editors/render/render_intern.h index 08001688e3f..18ba2b5abf9 100644 --- a/source/blender/editors/render/render_intern.h +++ b/source/blender/editors/render/render_intern.h @@ -29,8 +29,8 @@ */ -#ifndef RENDER_INTERN_H -#define RENDER_INTERN_H +#ifndef __RENDER_INTERN_H__ +#define __RENDER_INTERN_H__ struct wmOperatorType; struct RenderResult; @@ -77,5 +77,5 @@ void RENDER_OT_view_cancel(struct wmOperatorType *ot); /* render_opengl.c */ void RENDER_OT_opengl(struct wmOperatorType *ot); -#endif /* RENDER_INTERN_H */ +#endif /* __RENDER_INTERN_H__ */ diff --git a/source/blender/editors/screen/screen_intern.h b/source/blender/editors/screen/screen_intern.h index b882a0881a1..90533fd3a12 100644 --- a/source/blender/editors/screen/screen_intern.h +++ b/source/blender/editors/screen/screen_intern.h @@ -28,8 +28,8 @@ * \ingroup edscr */ -#ifndef ED_SCREEN_INTERN_H -#define ED_SCREEN_INTERN_H +#ifndef __SCREEN_INTERN_H__ +#define __SCREEN_INTERN_H__ /* internal exports only */ struct wmWindow; @@ -65,7 +65,7 @@ extern const char *screen_context_dir[]; /* doc access */ void SCREEN_OT_screenshot(struct wmOperatorType *ot); void SCREEN_OT_screencast(struct wmOperatorType *ot); -#endif /* ED_SCREEN_INTERN_H */ +#endif /* __SCREEN_INTERN_H__ */ diff --git a/source/blender/editors/sculpt_paint/paint_intern.h b/source/blender/editors/sculpt_paint/paint_intern.h index 73dc1e236f6..b4315c2847d 100644 --- a/source/blender/editors/sculpt_paint/paint_intern.h +++ b/source/blender/editors/sculpt_paint/paint_intern.h @@ -29,8 +29,8 @@ */ -#ifndef ED_PAINT_INTERN_H -#define ED_PAINT_INTERN_H +#ifndef __PAINT_INTERN_H__ +#define __PAINT_INTERN_H__ struct ARegion; struct bContext; @@ -168,5 +168,5 @@ struct ListBase *undo_paint_push_get_list(int type); void undo_paint_push_count_alloc(int type, int size); void undo_paint_push_end(int type); -#endif /* ED_PAINT_INTERN_H */ +#endif /* __PAINT_INTERN_H__ */ diff --git a/source/blender/editors/sculpt_paint/sculpt_intern.h b/source/blender/editors/sculpt_paint/sculpt_intern.h index 275d1d52355..a69d5b2ee56 100644 --- a/source/blender/editors/sculpt_paint/sculpt_intern.h +++ b/source/blender/editors/sculpt_paint/sculpt_intern.h @@ -30,8 +30,8 @@ */ -#ifndef BDR_SCULPTMODE_H -#define BDR_SCULPTMODE_H +#ifndef __SCULPT_INTERN_H__ +#define __SCULPT_INTERN_H__ #include "DNA_listBase.h" #include "DNA_vec_types.h" diff --git a/source/blender/editors/sound/sound_intern.h b/source/blender/editors/sound/sound_intern.h index 91c1b5d1456..e8a8ec55ab5 100644 --- a/source/blender/editors/sound/sound_intern.h +++ b/source/blender/editors/sound/sound_intern.h @@ -29,10 +29,10 @@ */ -#ifndef ED_SOUND_INTERN_H -#define ED_SOUND_INTERN_H +#ifndef __SOUND_INTERN_H__ +#define __SOUND_INTERN_H__ struct wmOperatorType; -#endif /* ED_SOUND_INTERN_H */ +#endif /* __SOUND_INTERN_H__ */ diff --git a/source/blender/editors/space_action/action_intern.h b/source/blender/editors/space_action/action_intern.h index 2a23f105737..751a809cac6 100644 --- a/source/blender/editors/space_action/action_intern.h +++ b/source/blender/editors/space_action/action_intern.h @@ -28,8 +28,8 @@ * \ingroup spaction */ -#ifndef ED_ACTION_INTERN_H -#define ED_ACTION_INTERN_H +#ifndef __ACTION_INTERN_H__ +#define __ACTION_INTERN_H__ struct bContext; struct bAnimContext; @@ -135,5 +135,5 @@ enum { void action_operatortypes(void); void action_keymap(struct wmKeyConfig *keyconf); -#endif /* ED_ACTION_INTERN_H */ +#endif /* __ACTION_INTERN_H__ */ diff --git a/source/blender/editors/space_buttons/buttons_intern.h b/source/blender/editors/space_buttons/buttons_intern.h index aa692a940d8..8d0f84cf70f 100644 --- a/source/blender/editors/space_buttons/buttons_intern.h +++ b/source/blender/editors/space_buttons/buttons_intern.h @@ -28,8 +28,8 @@ * \ingroup spbuttons */ -#ifndef ED_BUTTONS_INTERN_H -#define ED_BUTTONS_INTERN_H +#ifndef __BUTTONS_INTERN_H__ +#define __BUTTONS_INTERN_H__ #include "DNA_listBase.h" #include "RNA_types.h" @@ -117,5 +117,5 @@ void BUTTONS_OT_file_browse(struct wmOperatorType *ot); void BUTTONS_OT_directory_browse(struct wmOperatorType *ot); void BUTTONS_OT_toolbox(struct wmOperatorType *ot); -#endif /* ED_BUTTONS_INTERN_H */ +#endif /* __BUTTONS_INTERN_H__ */ diff --git a/source/blender/editors/space_clip/clip_intern.h b/source/blender/editors/space_clip/clip_intern.h index 9ff58a73ca2..c0b7137b5d8 100644 --- a/source/blender/editors/space_clip/clip_intern.h +++ b/source/blender/editors/space_clip/clip_intern.h @@ -29,8 +29,8 @@ * \ingroup spclip */ -#ifndef ED_CLIP_INTERN_H -#define ED_CLIP_INTERN_H +#ifndef __CLIP_INTERN_H__ +#define __CLIP_INTERN_H__ struct bContext; struct ARegion; @@ -152,4 +152,4 @@ void CLIP_OT_tracking_object_remove(struct wmOperatorType *ot); void CLIP_OT_copy_tracks(struct wmOperatorType *ot); void CLIP_OT_paste_tracks(struct wmOperatorType *ot); -#endif /* ED_CLIP_INTERN_H */ +#endif /* __CLIP_INTERN_H__ */ diff --git a/source/blender/editors/space_console/console_intern.h b/source/blender/editors/space_console/console_intern.h index 1c7aef01450..ce5c5f81f63 100644 --- a/source/blender/editors/space_console/console_intern.h +++ b/source/blender/editors/space_console/console_intern.h @@ -24,8 +24,8 @@ * \ingroup spconsole */ -#ifndef ED_CONSOLE_INTERN_H -#define ED_CONSOLE_INTERN_H +#ifndef __CONSOLE_INTERN_H__ +#define __CONSOLE_INTERN_H__ /* internal exports only */ @@ -69,4 +69,4 @@ void CONSOLE_OT_select_set(struct wmOperatorType *ot); enum { LINE_BEGIN, LINE_END, PREV_CHAR, NEXT_CHAR, PREV_WORD, NEXT_WORD }; enum { DEL_ALL, DEL_NEXT_CHAR, DEL_PREV_CHAR, DEL_SELECTION, DEL_NEXT_SEL, DEL_PREV_SEL }; -#endif /* ED_CONSOLE_INTERN_H */ +#endif /* __CONSOLE_INTERN_H__ */ diff --git a/source/blender/editors/space_file/file_intern.h b/source/blender/editors/space_file/file_intern.h index d9de804404e..e2c0591f901 100644 --- a/source/blender/editors/space_file/file_intern.h +++ b/source/blender/editors/space_file/file_intern.h @@ -28,8 +28,8 @@ * \ingroup spfile */ -#ifndef ED_FILE_INTERN_H -#define ED_FILE_INTERN_H +#ifndef __FILE_INTERN_H__ +#define __FILE_INTERN_H__ /* internal exports only */ @@ -112,5 +112,5 @@ void autocomplete_file(struct bContext *C, char *str, void *arg_v); /* file_panels.c */ void file_panels_register(struct ARegionType *art); -#endif /* ED_FILE_INTERN_H */ +#endif /* __FILE_INTERN_H__ */ diff --git a/source/blender/editors/space_file/filelist.h b/source/blender/editors/space_file/filelist.h index 0a8824e473d..fac6a387b9f 100644 --- a/source/blender/editors/space_file/filelist.h +++ b/source/blender/editors/space_file/filelist.h @@ -30,8 +30,8 @@ */ -#ifndef FILELIST_H -#define FILELIST_H +#ifndef __FILELIST_H__ +#define __FILELIST_H__ #ifdef __cplusplus extern "C" { diff --git a/source/blender/editors/space_file/fsmenu.h b/source/blender/editors/space_file/fsmenu.h index 5947db073f6..0d046fd985d 100644 --- a/source/blender/editors/space_file/fsmenu.h +++ b/source/blender/editors/space_file/fsmenu.h @@ -31,8 +31,8 @@ */ -#ifndef BSE_FSMENU_H -#define BSE_FSMENU_H +#ifndef __FSMENU_H__ +#define __FSMENU_H__ /* XXX could become UserPref */ #define FSMENU_RECENT_MAX 10 diff --git a/source/blender/editors/space_graph/graph_intern.h b/source/blender/editors/space_graph/graph_intern.h index bc4fa398221..363ec407f71 100644 --- a/source/blender/editors/space_graph/graph_intern.h +++ b/source/blender/editors/space_graph/graph_intern.h @@ -28,8 +28,8 @@ * \ingroup spgraph */ -#ifndef ED_GRAPH_INTERN_H -#define ED_GRAPH_INTERN_H +#ifndef __GRAPH_INTERN_H__ +#define __GRAPH_INTERN_H__ struct bContext; struct wmWindowManager; @@ -173,5 +173,5 @@ void graphedit_keymap(struct wmKeyConfig *keyconf); void graphedit_operatortypes(void); -#endif /* ED_GRAPH_INTERN_H */ +#endif /* __GRAPH_INTERN_H__ */ diff --git a/source/blender/editors/space_image/image_intern.h b/source/blender/editors/space_image/image_intern.h index 29673f74538..71762a087a7 100644 --- a/source/blender/editors/space_image/image_intern.h +++ b/source/blender/editors/space_image/image_intern.h @@ -29,8 +29,8 @@ */ -#ifndef ED_IMAGE_INTERN_H -#define ED_IMAGE_INTERN_H +#ifndef __IMAGE_INTERN_H__ +#define __IMAGE_INTERN_H__ /* internal exports only */ struct bContext; @@ -95,5 +95,5 @@ void image_buttons_register(struct ARegionType *art); void IMAGE_OT_properties(struct wmOperatorType *ot); void IMAGE_OT_scopes(struct wmOperatorType *ot); -#endif /* ED_IMAGE_INTERN_H */ +#endif /* __IMAGE_INTERN_H__ */ diff --git a/source/blender/editors/space_info/info_intern.h b/source/blender/editors/space_info/info_intern.h index fc0615a914b..80018e849d3 100644 --- a/source/blender/editors/space_info/info_intern.h +++ b/source/blender/editors/space_info/info_intern.h @@ -28,8 +28,8 @@ * \ingroup spinfo */ -#ifndef ED_INFO_INTERN_H -#define ED_INFO_INTERN_H +#ifndef __INFO_INTERN_H__ +#define __INFO_INTERN_H__ /* internal exports only */ @@ -61,4 +61,4 @@ void INFO_OT_report_replay(struct wmOperatorType *ot); void INFO_OT_report_delete(struct wmOperatorType *ot); void INFO_OT_report_copy(struct wmOperatorType *ot); -#endif /* ED_INFO_INTERN_H */ +#endif /* __INFO_INTERN_H__ */ diff --git a/source/blender/editors/space_logic/logic_intern.h b/source/blender/editors/space_logic/logic_intern.h index 457fe14352c..3e0b13e9d6c 100644 --- a/source/blender/editors/space_logic/logic_intern.h +++ b/source/blender/editors/space_logic/logic_intern.h @@ -29,8 +29,8 @@ */ -#ifndef ED_LOGIC_INTERN_H -#define ED_LOGIC_INTERN_H +#ifndef __LOGIC_INTERN_H__ +#define __LOGIC_INTERN_H__ /* internal exports only */ struct bContext; @@ -56,5 +56,5 @@ void LOGIC_OT_links_cut(struct wmOperatorType *ot); void logic_buttons(struct bContext *C, struct ARegion *ar); void make_unique_prop_names(struct bContext *C, char *str); -#endif /* ED_LOGIC_INTERN_H */ +#endif /* __LOGIC_INTERN_H__ */ diff --git a/source/blender/editors/space_nla/nla_intern.h b/source/blender/editors/space_nla/nla_intern.h index 00c16d68f36..9d0762ce108 100644 --- a/source/blender/editors/space_nla/nla_intern.h +++ b/source/blender/editors/space_nla/nla_intern.h @@ -28,8 +28,8 @@ * \ingroup spnla */ -#ifndef ED_NLA_INTERN_H -#define ED_NLA_INTERN_H +#ifndef __NLA_INTERN_H__ +#define __NLA_INTERN_H__ /* internal exports only */ @@ -140,5 +140,5 @@ short nlaedit_is_tweakmode_on(bAnimContext *ac); void nla_operatortypes(void); void nla_keymap(wmKeyConfig *keyconf); -#endif /* ED_NLA_INTERN_H */ +#endif /* __NLA_INTERN_H__ */ diff --git a/source/blender/editors/space_node/node_intern.h b/source/blender/editors/space_node/node_intern.h index 186ad3768be..48501079e60 100644 --- a/source/blender/editors/space_node/node_intern.h +++ b/source/blender/editors/space_node/node_intern.h @@ -28,8 +28,8 @@ * \ingroup spnode */ -#ifndef ED_NODE_INTERN_H -#define ED_NODE_INTERN_H +#ifndef __NODE_INTERN_H__ +#define __NODE_INTERN_H__ #include <stddef.h> /* for size_t */ #include "UI_interface.h" @@ -190,4 +190,4 @@ enum { B_NODE_SETIMAGE, } eNodeSpace_ButEvents; -#endif /* ED_NODE_INTERN_H */ +#endif /* __NODE_INTERN_H__ */ diff --git a/source/blender/editors/space_outliner/outliner_intern.h b/source/blender/editors/space_outliner/outliner_intern.h index be33fc2e37a..8c53e9ad111 100644 --- a/source/blender/editors/space_outliner/outliner_intern.h +++ b/source/blender/editors/space_outliner/outliner_intern.h @@ -29,8 +29,8 @@ */ -#ifndef ED_OUTLINER_INTERN_H -#define ED_OUTLINER_INTERN_H +#ifndef __OUTLINER_INTERN_H__ +#define __OUTLINER_INTERN_H__ #include "RNA_types.h" @@ -237,4 +237,4 @@ void OUTLINER_OT_action_set(struct wmOperatorType *ot); void outliner_operatortypes(void); void outliner_keymap(struct wmKeyConfig *keyconf); -#endif /* ED_OUTLINER_INTERN_H */ +#endif /* __OUTLINER_INTERN_H__ */ diff --git a/source/blender/editors/space_script/script_intern.h b/source/blender/editors/space_script/script_intern.h index 98e9699079b..00863863994 100644 --- a/source/blender/editors/space_script/script_intern.h +++ b/source/blender/editors/space_script/script_intern.h @@ -28,8 +28,8 @@ * \ingroup spscript */ -#ifndef ED_SCRIPT_INTERN_H -#define ED_SCRIPT_INTERN_H +#ifndef __SCRIPT_INTERN_H__ +#define __SCRIPT_INTERN_H__ /* internal exports only */ @@ -41,5 +41,5 @@ void script_keymap(struct wmKeyConfig *keyconf); void SCRIPT_OT_reload(struct wmOperatorType *ot); void SCRIPT_OT_python_file_run(struct wmOperatorType *ot); -#endif /* ED_SCRIPT_INTERN_H */ +#endif /* __SCRIPT_INTERN_H__ */ diff --git a/source/blender/editors/space_sequencer/sequencer_intern.h b/source/blender/editors/space_sequencer/sequencer_intern.h index 812bdbc678f..91d4e490ddc 100644 --- a/source/blender/editors/space_sequencer/sequencer_intern.h +++ b/source/blender/editors/space_sequencer/sequencer_intern.h @@ -28,8 +28,8 @@ * \ingroup spseq */ -#ifndef ED_SEQUENCER_INTERN_H -#define ED_SEQUENCER_INTERN_H +#ifndef __SEQUENCER_INTERN_H__ +#define __SEQUENCER_INTERN_H__ #include "RNA_access.h" #include "DNA_sequence_types.h" @@ -176,5 +176,5 @@ struct ImBuf *make_histogram_view_from_ibuf(struct ImBuf * ibuf); void SEQUENCER_OT_properties(struct wmOperatorType *ot); void sequencer_buttons_register(struct ARegionType *art); -#endif /* ED_SEQUENCER_INTERN_H */ +#endif /* __SEQUENCER_INTERN_H__ */ diff --git a/source/blender/editors/space_text/text_intern.h b/source/blender/editors/space_text/text_intern.h index 043fb97547b..2d297dd20d7 100644 --- a/source/blender/editors/space_text/text_intern.h +++ b/source/blender/editors/space_text/text_intern.h @@ -28,8 +28,8 @@ * \ingroup sptext */ -#ifndef ED_TEXT_INTERN_H -#define ED_TEXT_INTERN_H +#ifndef __TEXT_INTERN_H__ +#define __TEXT_INTERN_H__ /* internal exports only */ @@ -163,5 +163,5 @@ void TEXT_OT_resolve_conflict(struct wmOperatorType *ot); /* space_text.c */ extern const char *text_context_dir[]; /* doc access */ -#endif /* ED_TEXT_INTERN_H */ +#endif /* __TEXT_INTERN_H__ */ diff --git a/source/blender/editors/space_time/time_intern.h b/source/blender/editors/space_time/time_intern.h index a345d00bd74..ce52cbbd65e 100644 --- a/source/blender/editors/space_time/time_intern.h +++ b/source/blender/editors/space_time/time_intern.h @@ -29,8 +29,8 @@ */ -#ifndef ED_TIME_INTERN_H -#define ED_TIME_INTERN_H +#ifndef __TIME_INTERN_H__ +#define __TIME_INTERN_H__ /* internal exports only */ @@ -40,5 +40,5 @@ struct wmWindowManager; void time_operatortypes(void); void time_keymap(struct wmKeyConfig *keyconf); -#endif /* ED_TIME_INTERN_H */ +#endif /* __TIME_INTERN_H__ */ diff --git a/source/blender/editors/space_userpref/userpref_intern.h b/source/blender/editors/space_userpref/userpref_intern.h index fc6d218b20c..03074290d13 100644 --- a/source/blender/editors/space_userpref/userpref_intern.h +++ b/source/blender/editors/space_userpref/userpref_intern.h @@ -28,10 +28,10 @@ * \ingroup spuserpref */ -#ifndef ED_USERPREF_INTERN_H -#define ED_USERPREF_INTERN_H +#ifndef __USERPREF_INTERN_H__ +#define __USERPREF_INTERN_H__ /* internal exports only */ -#endif /* ED_USERPREF_INTERN_H */ +#endif /* __USERPREF_INTERN_H__ */ diff --git a/source/blender/editors/space_view3d/view3d_intern.h b/source/blender/editors/space_view3d/view3d_intern.h index 07754c0883c..40037f82376 100644 --- a/source/blender/editors/space_view3d/view3d_intern.h +++ b/source/blender/editors/space_view3d/view3d_intern.h @@ -28,8 +28,8 @@ * \ingroup spview3d */ -#ifndef ED_VIEW3D_INTERN_H -#define ED_VIEW3D_INTERN_H +#ifndef __VIEW3D_INTERN_H__ +#define __VIEW3D_INTERN_H__ #include "ED_view3d.h" @@ -215,5 +215,5 @@ extern float view3d_camera_border_hack_col[4]; extern short view3d_camera_border_hack_test; #endif -#endif /* ED_VIEW3D_INTERN_H */ +#endif /* __VIEW3D_INTERN_H__ */ diff --git a/source/blender/editors/transform/transform.h b/source/blender/editors/transform/transform.h index aab7dda0e86..4c4c2f67d82 100644 --- a/source/blender/editors/transform/transform.h +++ b/source/blender/editors/transform/transform.h @@ -30,8 +30,8 @@ */ -#ifndef TRANSFORM_H -#define TRANSFORM_H +#ifndef __TRANSFORM_H__ +#define __TRANSFORM_H__ #include "ED_transform.h" #include "ED_numinput.h" diff --git a/source/blender/editors/util/util_intern.h b/source/blender/editors/util/util_intern.h index c6e2d079c28..d366ad7997f 100644 --- a/source/blender/editors/util/util_intern.h +++ b/source/blender/editors/util/util_intern.h @@ -29,8 +29,8 @@ */ -#ifndef ED_UTIL_INTERN_H -#define ED_UTIL_INTERN_H +#ifndef __UTIL_INTERN_H__ +#define __UTIL_INTERN_H__ /* internal exports only */ @@ -42,5 +42,5 @@ void *undo_editmode_get_prev (struct Object *ob); void undo_editmode_step (struct bContext *C, int step); void undo_editmode_number (struct bContext *C, int nr); -#endif /* ED_UTIL_INTERN_H */ +#endif /* __UTIL_INTERN_H__ */ diff --git a/source/blender/editors/uvedit/uvedit_intern.h b/source/blender/editors/uvedit/uvedit_intern.h index ef25159a3af..a5b4173cc67 100644 --- a/source/blender/editors/uvedit/uvedit_intern.h +++ b/source/blender/editors/uvedit/uvedit_intern.h @@ -29,8 +29,8 @@ */ -#ifndef ED_UVEDIT_INTERN_H -#define ED_UVEDIT_INTERN_H +#ifndef __UVEDIT_INTERN_H__ +#define __UVEDIT_INTERN_H__ struct EditFace; struct EditMesh; @@ -111,5 +111,5 @@ void UV_OT_sphere_project(struct wmOperatorType *ot); void UV_OT_unwrap(struct wmOperatorType *ot); void UV_OT_stitch(struct wmOperatorType *ot); -#endif /* ED_UVEDIT_INTERN_H */ +#endif /* __UVEDIT_INTERN_H__ */ diff --git a/source/blender/editors/uvedit/uvedit_parametrizer.h b/source/blender/editors/uvedit/uvedit_parametrizer.h index e8dac7346ac..2cb4759c5ae 100644 --- a/source/blender/editors/uvedit/uvedit_parametrizer.h +++ b/source/blender/editors/uvedit/uvedit_parametrizer.h @@ -2,8 +2,8 @@ * \ingroup eduv */ -#ifndef __PARAMETRIZER_H__ -#define __PARAMETRIZER_H__ +#ifndef __UVEDIT_PARAMETRIZER_H__ +#define __UVEDIT_PARAMETRIZER_H__ #ifdef __cplusplus extern "C" { @@ -96,5 +96,5 @@ void param_flush_restore(ParamHandle *handle); } #endif -#endif /*__PARAMETRIZER_H__*/ +#endif /*__UVEDIT_PARAMETRIZER_H__*/ diff --git a/source/blender/gpu/GPU_draw.h b/source/blender/gpu/GPU_draw.h index f73bd402167..89976699114 100644 --- a/source/blender/gpu/GPU_draw.h +++ b/source/blender/gpu/GPU_draw.h @@ -29,8 +29,8 @@ * \ingroup gpu */ -#ifndef GPU_GAME_H -#define GPU_GAME_H +#ifndef __GPU_DRAW_H__ +#define __GPU_DRAW_H__ #ifdef __cplusplus extern "C" { diff --git a/source/blender/gpu/GPU_extensions.h b/source/blender/gpu/GPU_extensions.h index 9fb0dd1ae07..5ec373802a3 100644 --- a/source/blender/gpu/GPU_extensions.h +++ b/source/blender/gpu/GPU_extensions.h @@ -29,8 +29,8 @@ * \ingroup gpu */ -#ifndef GPU_EXTENSIONS_H -#define GPU_EXTENSIONS_H +#ifndef __GPU_EXTENSIONS_H__ +#define __GPU_EXTENSIONS_H__ #ifdef __cplusplus extern "C" { diff --git a/source/blender/gpu/GPU_material.h b/source/blender/gpu/GPU_material.h index 5689f02d2d7..8254c0f30ca 100644 --- a/source/blender/gpu/GPU_material.h +++ b/source/blender/gpu/GPU_material.h @@ -29,8 +29,8 @@ * \ingroup gpu */ -#ifndef __GPU_MATERIAL__ -#define __GPU_MATERIAL__ +#ifndef __GPU_MATERIAL_H__ +#define __GPU_MATERIAL_H__ #include "DNA_listBase.h" @@ -238,5 +238,5 @@ int GPU_lamp_shadow_layer(GPULamp *lamp); } #endif -#endif /*__GPU_MATERIAL__*/ +#endif /*__GPU_MATERIAL_H__*/ diff --git a/source/blender/ikplugin/BIK_api.h b/source/blender/ikplugin/BIK_api.h index 4b90b2546ff..cbc6485cb54 100644 --- a/source/blender/ikplugin/BIK_api.h +++ b/source/blender/ikplugin/BIK_api.h @@ -31,8 +31,8 @@ */ -#ifndef BIK_API_H -#define BIK_API_H +#ifndef __BIK_API_H__ +#define __BIK_API_H__ #ifdef __cplusplus extern "C" { @@ -92,5 +92,5 @@ int BIK_get_solver_param(struct bPose *pose, struct bPoseChannel *pchan, int id, } #endif -#endif // BIK_API_H +#endif // __BIK_API_H__ diff --git a/source/blender/ikplugin/intern/ikplugin_api.h b/source/blender/ikplugin/intern/ikplugin_api.h index b1e723289ec..77c962269dc 100644 --- a/source/blender/ikplugin/intern/ikplugin_api.h +++ b/source/blender/ikplugin/intern/ikplugin_api.h @@ -31,8 +31,8 @@ */ -#ifndef IKPLUGIN_API_H -#define IKPLUGIN_API_H +#ifndef __IKPLUGIN_API_H__ +#define __IKPLUGIN_API_H__ #ifdef __cplusplus extern "C" { @@ -60,5 +60,5 @@ typedef struct IKPlugin IKPlugin; } #endif -#endif // IKPLUGIN_API_H +#endif // __IKPLUGIN_API_H__ diff --git a/source/blender/ikplugin/intern/iksolver_plugin.h b/source/blender/ikplugin/intern/iksolver_plugin.h index 885383ab65e..dd00c5f4add 100644 --- a/source/blender/ikplugin/intern/iksolver_plugin.h +++ b/source/blender/ikplugin/intern/iksolver_plugin.h @@ -31,8 +31,8 @@ */ -#ifndef IKSOLVER_PLUGIN_H -#define IKSOLVER_PLUGIN_H +#ifndef __IKSOLVER_PLUGIN_H__ +#define __IKSOLVER_PLUGIN_H__ #include "ikplugin_api.h" @@ -47,5 +47,5 @@ void iksolver_execute_tree(struct Scene *scene, struct Object *ob, struct bPose } #endif -#endif // IKSOLVER_PLUGIN_H +#endif // __IKSOLVER_PLUGIN_H__ diff --git a/source/blender/ikplugin/intern/itasc_plugin.h b/source/blender/ikplugin/intern/itasc_plugin.h index 1d6acb2cce3..0d5fde0bec0 100644 --- a/source/blender/ikplugin/intern/itasc_plugin.h +++ b/source/blender/ikplugin/intern/itasc_plugin.h @@ -31,8 +31,8 @@ */ -#ifndef ITASC_PLUGIN_H -#define ITASC_PLUGIN_H +#ifndef __ITASC_PLUGIN_H__ +#define __ITASC_PLUGIN_H__ #include "ikplugin_api.h" @@ -52,5 +52,5 @@ void itasc_test_constraint(struct Object *ob, struct bConstraint *cons); } #endif -#endif // ITASC_PLUGIN_H +#endif // __ITASC_PLUGIN_H__ diff --git a/source/blender/imbuf/IMB_imbuf.h b/source/blender/imbuf/IMB_imbuf.h index 07f1b9e4683..9d21cc6d8d9 100644 --- a/source/blender/imbuf/IMB_imbuf.h +++ b/source/blender/imbuf/IMB_imbuf.h @@ -68,8 +68,8 @@ * posix-compliant. */ -#ifndef IMB_IMBUF_H -#define IMB_IMBUF_H +#ifndef __IMB_IMBUF_H__ +#define __IMB_IMBUF_H__ /** * diff --git a/source/blender/imbuf/IMB_imbuf_types.h b/source/blender/imbuf/IMB_imbuf_types.h index cb5d6721566..c2b42db447d 100644 --- a/source/blender/imbuf/IMB_imbuf_types.h +++ b/source/blender/imbuf/IMB_imbuf_types.h @@ -44,8 +44,8 @@ * \todo Clean up includes. */ -#ifndef IMB_IMBUF_TYPES_H -#define IMB_IMBUF_TYPES_H +#ifndef __IMB_IMBUF_TYPES_H__ +#define __IMB_IMBUF_TYPES_H__ struct ImMetaData; diff --git a/source/blender/imbuf/IMB_moviecache.h b/source/blender/imbuf/IMB_moviecache.h index 309c6ee550e..3fa98a04d8d 100644 --- a/source/blender/imbuf/IMB_moviecache.h +++ b/source/blender/imbuf/IMB_moviecache.h @@ -24,8 +24,8 @@ * ***** END GPL LICENSE BLOCK ***** */ -#ifndef IMB_MOVIECACHE_H -#define IMB_MOVIECACHE_H +#ifndef __IMB_MOVIECACHE_H__ +#define __IMB_MOVIECACHE_H__ /** \file IMB_moviecache.h * \ingroup imbuf diff --git a/source/blender/imbuf/IMB_thumbs.h b/source/blender/imbuf/IMB_thumbs.h index ad620007abe..49e90134d21 100644 --- a/source/blender/imbuf/IMB_thumbs.h +++ b/source/blender/imbuf/IMB_thumbs.h @@ -30,8 +30,8 @@ */ -#ifndef _IMB_THUMBS_H -#define _IMB_THUMBS_H +#ifndef __IMB_THUMBS_H__ +#define __IMB_THUMBS_H__ #ifdef __cplusplus extern "C" { @@ -85,5 +85,5 @@ void IMB_overlayblend_thumb(unsigned int *thumb, int width, int height, float as } #endif /* __cplusplus */ -#endif /* _IMB_THUMBS_H */ +#endif /* __IMB_THUMBS_H__ */ diff --git a/source/blender/imbuf/intern/IMB_allocimbuf.h b/source/blender/imbuf/intern/IMB_allocimbuf.h index c2f1d2a1f51..52b3bc1f11a 100644 --- a/source/blender/imbuf/intern/IMB_allocimbuf.h +++ b/source/blender/imbuf/intern/IMB_allocimbuf.h @@ -33,8 +33,8 @@ * \ingroup imbuf * \brief Header file for allocimbuf.c */ -#ifndef IMB_ALLOCIMBUF_H -#define IMB_ALLOCIMBUF_H +#ifndef __IMB_ALLOCIMBUF_H__ +#define __IMB_ALLOCIMBUF_H__ struct ImBuf; diff --git a/source/blender/imbuf/intern/IMB_anim.h b/source/blender/imbuf/intern/IMB_anim.h index a9f020c94e8..b29d9d419e2 100644 --- a/source/blender/imbuf/intern/IMB_anim.h +++ b/source/blender/imbuf/intern/IMB_anim.h @@ -33,8 +33,8 @@ */ -#ifndef IMB_ANIM_H -#define IMB_ANIM_H +#ifndef __IMB_ANIM_H__ +#define __IMB_ANIM_H__ #ifdef _WIN32 # define INC_OLE2 diff --git a/source/blender/imbuf/intern/IMB_filetype.h b/source/blender/imbuf/intern/IMB_filetype.h index 4cd10ad01d0..83267ed323d 100644 --- a/source/blender/imbuf/intern/IMB_filetype.h +++ b/source/blender/imbuf/intern/IMB_filetype.h @@ -25,8 +25,8 @@ */ -#ifndef IMB_FILETYPE_H -#define IMB_FILETYPE_H +#ifndef __IMB_FILETYPE_H__ +#define __IMB_FILETYPE_H__ /* Generic File Type */ @@ -119,5 +119,5 @@ void imb_loadtiletiff(struct ImBuf *ibuf, unsigned char *mem, size_t size, int imb_savetiff(struct ImBuf *ibuf, const char *name, int flags); void *libtiff_findsymbol(char *name); -#endif /* IMB_FILETYPE_H */ +#endif /* __IMB_FILETYPE_H__ */ diff --git a/source/blender/imbuf/intern/IMB_filter.h b/source/blender/imbuf/intern/IMB_filter.h index 29e6c4950df..6199cc13bb9 100644 --- a/source/blender/imbuf/intern/IMB_filter.h +++ b/source/blender/imbuf/intern/IMB_filter.h @@ -33,8 +33,8 @@ * \brief Function declarations for filter.c */ -#ifndef IMB_FILTER_H -#define IMB_FILTER_H +#ifndef __IMB_FILTER_H__ +#define __IMB_FILTER_H__ struct ImBuf; diff --git a/source/blender/imbuf/intern/IMB_indexer.h b/source/blender/imbuf/intern/IMB_indexer.h index f9d90208078..6546840ea85 100644 --- a/source/blender/imbuf/intern/IMB_indexer.h +++ b/source/blender/imbuf/intern/IMB_indexer.h @@ -22,8 +22,8 @@ */ -#ifndef IMB_INDEXER_H -#define IMB_INDEXER_H +#ifndef __IMB_INDEXER_H__ +#define __IMB_INDEXER_H__ #ifdef WIN32 # include <io.h> diff --git a/source/blender/imbuf/intern/IMB_metadata.h b/source/blender/imbuf/intern/IMB_metadata.h index 0f57b8f654a..9b3a8004c74 100644 --- a/source/blender/imbuf/intern/IMB_metadata.h +++ b/source/blender/imbuf/intern/IMB_metadata.h @@ -30,8 +30,8 @@ */ -#ifndef _IMB_IMGINFO_H -#define _IMB_IMGINFO_H +#ifndef __IMB_METADATA_H__ +#define __IMB_METADATA_H__ struct ImBuf; @@ -80,4 +80,4 @@ int IMB_metadata_add_field(struct ImBuf* img, const char* key, const char* field */ int IMB_metadata_del_field(struct ImBuf *img, const char *key); -#endif /* _IMB_IMGINFO_H */ +#endif /* __IMB_METADATA_H__ */ diff --git a/source/blender/imbuf/intern/cineon/cineonfile.h b/source/blender/imbuf/intern/cineon/cineonfile.h index 896e0af65b3..ea321c87d48 100644 --- a/source/blender/imbuf/intern/cineon/cineonfile.h +++ b/source/blender/imbuf/intern/cineon/cineonfile.h @@ -26,8 +26,8 @@ * */ -#ifndef _CINEON_FILE_H_ -#define _CINEON_FILE_H_ +#ifndef __CINEONFILE_H__ +#define __CINEONFILE_H__ #include "logImageCore.h" @@ -130,4 +130,4 @@ typedef struct { } #endif -#endif /* _CINEON_FILE_H_ */ +#endif /* __CINEONFILE_H__ */ diff --git a/source/blender/imbuf/intern/cineon/cineonlib.h b/source/blender/imbuf/intern/cineon/cineonlib.h index c24503e2ada..b1ad0532e25 100644 --- a/source/blender/imbuf/intern/cineon/cineonlib.h +++ b/source/blender/imbuf/intern/cineon/cineonlib.h @@ -23,8 +23,8 @@ * */ -#ifndef _CINEON_LIB_H_ -#define _CINEON_LIB_H_ +#ifndef __CINEONLIB_H__ +#define __CINEONLIB_H__ #include "logImageCore.h" @@ -68,4 +68,4 @@ void cineonClose(CineonFile* cineon); } #endif -#endif /* _CINEON_LIB_H_ */ +#endif /* __CINEONLIB_H__ */ diff --git a/source/blender/imbuf/intern/cineon/dpxfile.h b/source/blender/imbuf/intern/cineon/dpxfile.h index abb11ec2e8c..dc8fc0bdbd2 100644 --- a/source/blender/imbuf/intern/cineon/dpxfile.h +++ b/source/blender/imbuf/intern/cineon/dpxfile.h @@ -26,8 +26,8 @@ * */ -#ifndef _DPX_FILE_H_ -#define _DPX_FILE_H_ +#ifndef __DPXFILE_H__ +#define __DPXFILE_H__ #include "logImageCore.h" @@ -124,4 +124,4 @@ typedef struct { } #endif -#endif /* _DPX_FILE_H_ */ +#endif /* __DPXFILE_H__ */ diff --git a/source/blender/imbuf/intern/cineon/dpxlib.h b/source/blender/imbuf/intern/cineon/dpxlib.h index 1607de311c3..b09c699ae5b 100644 --- a/source/blender/imbuf/intern/cineon/dpxlib.h +++ b/source/blender/imbuf/intern/cineon/dpxlib.h @@ -22,8 +22,8 @@ * */ -#ifndef _DPX_LIB_H_ -#define _DPX_LIB_H_ +#ifndef __DPXLIB_H__ +#define __DPXLIB_H__ #ifdef __cplusplus extern "C" { @@ -56,4 +56,4 @@ void dpxDump(const char* filename); } #endif -#endif /* _DPX_LIB_H_ */ +#endif /* __DPXLIB_H__ */ diff --git a/source/blender/imbuf/intern/cineon/logImageCore.h b/source/blender/imbuf/intern/cineon/logImageCore.h index cbc7cb9d64a..c8592621f08 100644 --- a/source/blender/imbuf/intern/cineon/logImageCore.h +++ b/source/blender/imbuf/intern/cineon/logImageCore.h @@ -27,8 +27,8 @@ * */ -#ifndef _LOG_IMAGE_CORE_H_ -#define _LOG_IMAGE_CORE_H_ +#ifndef __LOGIMAGECORE_H__ +#define __LOGIMAGECORE_H__ #include <stdio.h> #include "logImageLib.h" @@ -119,4 +119,4 @@ R32 reverseR32(R32 value); } #endif -#endif /* _LOG_IMAGE_CORE_H_ */ +#endif /* __LOGIMAGECORE_H__ */ diff --git a/source/blender/imbuf/intern/cineon/logImageLib.h b/source/blender/imbuf/intern/cineon/logImageLib.h index 9f6d3ad2adf..72448ed962b 100644 --- a/source/blender/imbuf/intern/cineon/logImageLib.h +++ b/source/blender/imbuf/intern/cineon/logImageLib.h @@ -22,8 +22,8 @@ * */ -#ifndef _LOG_IMAGE_LIB_H_ -#define _LOG_IMAGE_LIB_H_ +#ifndef __LOGIMAGELIB_H__ +#define __LOGIMAGELIB_H__ #ifdef __cplusplus extern "C" { @@ -87,4 +87,4 @@ void logImageDump(const char* filename); } #endif -#endif /* _LOG_IMAGE_LIB_H_ */ +#endif /* __LOGIMAGELIB_H__ */ diff --git a/source/blender/imbuf/intern/cineon/logmemfile.h b/source/blender/imbuf/intern/cineon/logmemfile.h index 36f950232ac..2611463148e 100644 --- a/source/blender/imbuf/intern/cineon/logmemfile.h +++ b/source/blender/imbuf/intern/cineon/logmemfile.h @@ -22,11 +22,11 @@ * */ -#ifndef _LOGMEMFILE_H -#define _LOGMEMFILE_H +#ifndef __LOGMEMFILE_H__ +#define __LOGMEMFILE_H__ int logimage_fseek(void* logfile, intptr_t offsett, int origin); int logimage_fwrite(void *buffer, unsigned int size, unsigned int count, void *logfile); int logimage_fread(void *buffer, unsigned int size, unsigned int count, void *logfile); -#endif /* _LOGMEMFILE_H */ +#endif /* __LOGMEMFILE_H__ */ diff --git a/source/blender/imbuf/intern/dds/BlockDXT.h b/source/blender/imbuf/intern/dds/BlockDXT.h index cdf839ce9b4..c6712f4f058 100644 --- a/source/blender/imbuf/intern/dds/BlockDXT.h +++ b/source/blender/imbuf/intern/dds/BlockDXT.h @@ -55,8 +55,8 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. -#ifndef _DDS_BLOCKDXT_H -#define _DDS_BLOCKDXT_H +#ifndef __BLOCKDXT_H__ +#define __BLOCKDXT_H__ #include <Common.h> #include <Color.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 // _DDS_BLOCKDXT_H +#endif // __BLOCKDXT_H__ diff --git a/source/blender/imbuf/intern/dds/Color.h b/source/blender/imbuf/intern/dds/Color.h index b23a5a32bdc..17de0a596c6 100644 --- a/source/blender/imbuf/intern/dds/Color.h +++ b/source/blender/imbuf/intern/dds/Color.h @@ -34,8 +34,8 @@ // This code is in the public domain -- castanyo@yahoo.es -#ifndef _DDS_COLOR_H -#define _DDS_COLOR_H +#ifndef __COLOR_H__ +#define __COLOR_H__ /// 32 bit color stored as BGRA. class Color32 @@ -96,4 +96,4 @@ public: }; }; -#endif // _DDS_COLOR_H +#endif // __COLOR_H__ diff --git a/source/blender/imbuf/intern/dds/ColorBlock.h b/source/blender/imbuf/intern/dds/ColorBlock.h index eb483f559c2..e72b6253035 100644 --- a/source/blender/imbuf/intern/dds/ColorBlock.h +++ b/source/blender/imbuf/intern/dds/ColorBlock.h @@ -34,8 +34,8 @@ // This code is in the public domain -- castanyo@yahoo.es -#ifndef _DDS_COLORBLOCK_H -#define _DDS_COLORBLOCK_H +#ifndef __COLORBLOCK_H__ +#define __COLORBLOCK_H__ #include <Color.h> #include <Image.h> @@ -104,4 +104,4 @@ inline Color32 & ColorBlock::color(uint x, uint y) return m_color[y * 4 + x]; } -#endif // _DDS_COLORBLOCK_H +#endif // __COLORBLOCK_H__ diff --git a/source/blender/imbuf/intern/dds/Common.h b/source/blender/imbuf/intern/dds/Common.h index 8c307e346f0..4e3e3e024f7 100644 --- a/source/blender/imbuf/intern/dds/Common.h +++ b/source/blender/imbuf/intern/dds/Common.h @@ -25,8 +25,8 @@ */ -#ifndef _DDS_COMMON_H -#define _DDS_COMMON_H +#ifndef __COMMON_H__ +#define __COMMON_H__ #ifndef min #define min(a,b) ((a) <= (b) ? (a) : (b)) diff --git a/source/blender/imbuf/intern/dds/DirectDrawSurface.h b/source/blender/imbuf/intern/dds/DirectDrawSurface.h index 8b8388c9f89..23c8bbf2de3 100644 --- a/source/blender/imbuf/intern/dds/DirectDrawSurface.h +++ b/source/blender/imbuf/intern/dds/DirectDrawSurface.h @@ -55,8 +55,8 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. -#ifndef _DDS_DIRECTDRAWSURFACE_H -#define _DDS_DIRECTDRAWSURFACE_H +#ifndef __DIRECTDRAWSURFACE_H__ +#define __DIRECTDRAWSURFACE_H__ #include <Common.h> #include <Stream.h> @@ -198,4 +198,4 @@ void mem_read(Stream & mem, DDSCaps & caps); void mem_read(Stream & mem, DDSHeader & header); void mem_read(Stream & mem, DDSHeader10 & header); -#endif // _DDS_DIRECTDRAWSURFACE_H +#endif // __DIRECTDRAWSURFACE_H__ diff --git a/source/blender/imbuf/intern/dds/Image.h b/source/blender/imbuf/intern/dds/Image.h index e932e1122f2..9c2220567aa 100644 --- a/source/blender/imbuf/intern/dds/Image.h +++ b/source/blender/imbuf/intern/dds/Image.h @@ -34,8 +34,8 @@ // This code is in the public domain -- castanyo@yahoo.es -#ifndef _DDS_IMAGE_H -#define _DDS_IMAGE_H +#ifndef __IMAGE_H__ +#define __IMAGE_H__ #include <Common.h> #include <Color.h> @@ -101,4 +101,4 @@ inline Color32 & Image::pixel(uint x, uint y) return pixel(y * width() + x); } -#endif // _DDS_IMAGE_H +#endif // __IMAGE_H__ diff --git a/source/blender/imbuf/intern/dds/PixelFormat.h b/source/blender/imbuf/intern/dds/PixelFormat.h index c76c7994ed2..9add62c4616 100644 --- a/source/blender/imbuf/intern/dds/PixelFormat.h +++ b/source/blender/imbuf/intern/dds/PixelFormat.h @@ -55,8 +55,8 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. -#ifndef _DDS_PIXELFORMAT_H -#define _DDS_PIXELFORMAT_H +#ifndef __PIXELFORMAT_H__ +#define __PIXELFORMAT_H__ #include <Common.h> diff --git a/source/blender/imbuf/intern/dds/Stream.h b/source/blender/imbuf/intern/dds/Stream.h index 1c789ac948f..9f513ca8aba 100644 --- a/source/blender/imbuf/intern/dds/Stream.h +++ b/source/blender/imbuf/intern/dds/Stream.h @@ -27,8 +27,8 @@ /* simple memory stream functions with buffer overflow check */ -#ifndef _STREAM_H -#define _STREAM_H +#ifndef __STREAM_H__ +#define __STREAM_H__ struct Stream { @@ -45,5 +45,5 @@ 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__ diff --git a/source/blender/imbuf/intern/dds/dds_api.h b/source/blender/imbuf/intern/dds/dds_api.h index e477a4b8003..589257816e0 100644 --- a/source/blender/imbuf/intern/dds/dds_api.h +++ b/source/blender/imbuf/intern/dds/dds_api.h @@ -25,8 +25,8 @@ */ -#ifndef _DDS_API_H -#define _DDS_API_H +#ifndef __DDS_API_H__ +#define __DDS_API_H__ #ifdef __cplusplus extern "C" { diff --git a/source/blender/imbuf/intern/imbuf.h b/source/blender/imbuf/intern/imbuf.h index c1afecf621f..2125583375f 100644 --- a/source/blender/imbuf/intern/imbuf.h +++ b/source/blender/imbuf/intern/imbuf.h @@ -35,8 +35,8 @@ */ -#ifndef IMBUF_H -#define IMBUF_H +#ifndef __IMBUF_H__ +#define __IMBUF_H__ #include <stdlib.h> #include <sys/types.h> @@ -78,5 +78,5 @@ typedef unsigned char uchar; #define TRUE 1 #define FALSE 0 -#endif /* IMBUF_H */ +#endif /* __IMBUF_H__ */ diff --git a/source/blender/imbuf/intern/openexr/openexr_api.h b/source/blender/imbuf/intern/openexr/openexr_api.h index 8567673a3e3..2b3a17ba47d 100644 --- a/source/blender/imbuf/intern/openexr/openexr_api.h +++ b/source/blender/imbuf/intern/openexr/openexr_api.h @@ -30,8 +30,8 @@ */ -#ifndef _OPENEXR_API_H -#define _OPENEXR_API_H +#ifndef __OPENEXR_API_H__ +#define __OPENEXR_API_H__ #ifdef __cplusplus extern "C" { diff --git a/source/blender/imbuf/intern/openexr/openexr_multi.h b/source/blender/imbuf/intern/openexr/openexr_multi.h index abb675e1dca..84e3da0baa7 100644 --- a/source/blender/imbuf/intern/openexr/openexr_multi.h +++ b/source/blender/imbuf/intern/openexr/openexr_multi.h @@ -30,8 +30,8 @@ */ -#ifndef _OPENEXR_MULTI_H -#define _OPENEXR_MULTI_H +#ifndef __OPENEXR_MULTI_H__ +#define __OPENEXR_MULTI_H__ /* experiment with more advanced exr api */ diff --git a/source/blender/makesdna/DNA_ID.h b/source/blender/makesdna/DNA_ID.h index cb7b8d15d52..eb8d06fc9f2 100644 --- a/source/blender/makesdna/DNA_ID.h +++ b/source/blender/makesdna/DNA_ID.h @@ -30,8 +30,8 @@ * \brief ID and Library types, which are fundamental for sdna. */ -#ifndef DNA_ID_H -#define DNA_ID_H +#ifndef __DNA_ID_H__ +#define __DNA_ID_H__ #include "DNA_listBase.h" diff --git a/source/blender/makesdna/DNA_action_types.h b/source/blender/makesdna/DNA_action_types.h index e582d071319..058c72be639 100644 --- a/source/blender/makesdna/DNA_action_types.h +++ b/source/blender/makesdna/DNA_action_types.h @@ -29,8 +29,8 @@ * \ingroup DNA */ -#ifndef DNA_ACTION_TYPES_H -#define DNA_ACTION_TYPES_H +#ifndef __DNA_ACTION_TYPES_H__ +#define __DNA_ACTION_TYPES_H__ #include "DNA_listBase.h" #include "DNA_ID.h" diff --git a/source/blender/makesdna/DNA_actuator_types.h b/source/blender/makesdna/DNA_actuator_types.h index 3be46538c22..817da3cd445 100644 --- a/source/blender/makesdna/DNA_actuator_types.h +++ b/source/blender/makesdna/DNA_actuator_types.h @@ -29,8 +29,8 @@ * \ingroup DNA */ -#ifndef DNA_ACTUATOR_TYPES_H -#define DNA_ACTUATOR_TYPES_H +#ifndef __DNA_ACTUATOR_TYPES_H__ +#define __DNA_ACTUATOR_TYPES_H__ struct Object; struct Mesh; diff --git a/source/blender/makesdna/DNA_anim_types.h b/source/blender/makesdna/DNA_anim_types.h index 2233da86385..ae31bea4981 100644 --- a/source/blender/makesdna/DNA_anim_types.h +++ b/source/blender/makesdna/DNA_anim_types.h @@ -27,8 +27,8 @@ * \ingroup DNA */ -#ifndef DNA_ANIM_TYPES_H -#define DNA_ANIM_TYPES_H +#ifndef __DNA_ANIM_TYPES_H__ +#define __DNA_ANIM_TYPES_H__ #ifdef __cplusplus extern "C" { @@ -909,4 +909,4 @@ typedef struct IdAdtTemplate { }; #endif -#endif /* DNA_ANIM_TYPES_H */ +#endif /* __DNA_ANIM_TYPES_H__ */ diff --git a/source/blender/makesdna/DNA_armature_types.h b/source/blender/makesdna/DNA_armature_types.h index 33f965663de..f915b75a77f 100644 --- a/source/blender/makesdna/DNA_armature_types.h +++ b/source/blender/makesdna/DNA_armature_types.h @@ -27,8 +27,8 @@ * \ingroup DNA */ -#ifndef DNA_ARMATURE_TYPES_H -#define DNA_ARMATURE_TYPES_H +#ifndef __DNA_ARMATURE_TYPES_H__ +#define __DNA_ARMATURE_TYPES_H__ #include "DNA_listBase.h" #include "DNA_ID.h" diff --git a/source/blender/makesdna/DNA_boid_types.h b/source/blender/makesdna/DNA_boid_types.h index 53ff5179049..09221c4ada9 100644 --- a/source/blender/makesdna/DNA_boid_types.h +++ b/source/blender/makesdna/DNA_boid_types.h @@ -30,8 +30,8 @@ * \ingroup DNA */ -#ifndef DNA_BOID_TYPES_H -#define DNA_BOID_TYPES_H +#ifndef __DNA_BOID_TYPES_H__ +#define __DNA_BOID_TYPES_H__ #include "DNA_listBase.h" diff --git a/source/blender/makesdna/DNA_brush_types.h b/source/blender/makesdna/DNA_brush_types.h index 690c3c95964..454008c73a7 100644 --- a/source/blender/makesdna/DNA_brush_types.h +++ b/source/blender/makesdna/DNA_brush_types.h @@ -29,8 +29,8 @@ * \ingroup DNA */ -#ifndef DNA_BRUSH_TYPES_H -#define DNA_BRUSH_TYPES_H +#ifndef __DNA_BRUSH_TYPES_H__ +#define __DNA_BRUSH_TYPES_H__ #include "DNA_ID.h" diff --git a/source/blender/makesdna/DNA_camera_types.h b/source/blender/makesdna/DNA_camera_types.h index a46be730d6c..4618b99f6b6 100644 --- a/source/blender/makesdna/DNA_camera_types.h +++ b/source/blender/makesdna/DNA_camera_types.h @@ -29,8 +29,8 @@ * \ingroup DNA */ -#ifndef DNA_CAMERA_TYPES_H -#define DNA_CAMERA_TYPES_H +#ifndef __DNA_CAMERA_TYPES_H__ +#define __DNA_CAMERA_TYPES_H__ #include "DNA_defs.h" diff --git a/source/blender/makesdna/DNA_cloth_types.h b/source/blender/makesdna/DNA_cloth_types.h index 1079f1db835..79a1d821543 100644 --- a/source/blender/makesdna/DNA_cloth_types.h +++ b/source/blender/makesdna/DNA_cloth_types.h @@ -29,8 +29,8 @@ * \ingroup DNA */ -#ifndef DNA_CLOTH_TYPES_H -#define DNA_CLOTH_TYPES_H +#ifndef __DNA_CLOTH_TYPES_H__ +#define __DNA_CLOTH_TYPES_H__ /** * This struct contains all the global data required to run a simulation. diff --git a/source/blender/makesdna/DNA_color_types.h b/source/blender/makesdna/DNA_color_types.h index f5762f8b49f..676389ffeea 100644 --- a/source/blender/makesdna/DNA_color_types.h +++ b/source/blender/makesdna/DNA_color_types.h @@ -29,8 +29,8 @@ * \ingroup DNA */ -#ifndef DNA_COLOR_TYPES_H -#define DNA_COLOR_TYPES_H +#ifndef __DNA_COLOR_TYPES_H__ +#define __DNA_COLOR_TYPES_H__ #include "DNA_vec_types.h" diff --git a/source/blender/makesdna/DNA_constraint_types.h b/source/blender/makesdna/DNA_constraint_types.h index fdc493ddfd3..7a2d2929e47 100644 --- a/source/blender/makesdna/DNA_constraint_types.h +++ b/source/blender/makesdna/DNA_constraint_types.h @@ -30,8 +30,8 @@ * \ingroup DNA */ -#ifndef DNA_CONSTRAINT_TYPES_H -#define DNA_CONSTRAINT_TYPES_H +#ifndef __DNA_CONSTRAINT_TYPES_H__ +#define __DNA_CONSTRAINT_TYPES_H__ #include "DNA_defs.h" #include "DNA_ID.h" diff --git a/source/blender/makesdna/DNA_controller_types.h b/source/blender/makesdna/DNA_controller_types.h index 51ab29db7ae..bdfedb5b4d1 100644 --- a/source/blender/makesdna/DNA_controller_types.h +++ b/source/blender/makesdna/DNA_controller_types.h @@ -29,8 +29,8 @@ * \ingroup DNA */ -#ifndef DNA_CONTROLLER_TYPES_H -#define DNA_CONTROLLER_TYPES_H +#ifndef __DNA_CONTROLLER_TYPES_H__ +#define __DNA_CONTROLLER_TYPES_H__ struct bActuator; struct Text; diff --git a/source/blender/makesdna/DNA_curve_types.h b/source/blender/makesdna/DNA_curve_types.h index 455738c840b..d5b9477f7f6 100644 --- a/source/blender/makesdna/DNA_curve_types.h +++ b/source/blender/makesdna/DNA_curve_types.h @@ -29,8 +29,8 @@ * \ingroup DNA */ -#ifndef DNA_CURVE_TYPES_H -#define DNA_CURVE_TYPES_H +#ifndef __DNA_CURVE_TYPES_H__ +#define __DNA_CURVE_TYPES_H__ #include "DNA_defs.h" #include "DNA_listBase.h" diff --git a/source/blender/makesdna/DNA_customdata_types.h b/source/blender/makesdna/DNA_customdata_types.h index a4bb5715174..eeeb0581527 100644 --- a/source/blender/makesdna/DNA_customdata_types.h +++ b/source/blender/makesdna/DNA_customdata_types.h @@ -29,8 +29,8 @@ * \ingroup DNA */ -#ifndef DNA_CUSTOMDATA_TYPES_H -#define DNA_CUSTOMDATA_TYPES_H +#ifndef __DNA_CUSTOMDATA_TYPES_H__ +#define __DNA_CUSTOMDATA_TYPES_H__ #ifdef __cplusplus extern "C" { diff --git a/source/blender/makesdna/DNA_defs.h b/source/blender/makesdna/DNA_defs.h index 46d7fc2b009..aa2cfb3f6e9 100644 --- a/source/blender/makesdna/DNA_defs.h +++ b/source/blender/makesdna/DNA_defs.h @@ -24,8 +24,8 @@ * \ingroup DNA */ -#ifndef DNA_DEFS_H -#define DNA_DEFS_H +#ifndef __DNA_DEFS_H__ +#define __DNA_DEFS_H__ /* makesdna ignores */ #ifdef DNA_DEPRECATED_ALLOW @@ -50,4 +50,4 @@ /* non-id name variables should use this length */ #define MAX_NAME 64 -#endif /* DNA_DEFS_H */ +#endif /* __DNA_DEFS_H__ */ diff --git a/source/blender/makesdna/DNA_dynamicpaint_types.h b/source/blender/makesdna/DNA_dynamicpaint_types.h index 2345b8dd1c0..fedc603fde2 100644 --- a/source/blender/makesdna/DNA_dynamicpaint_types.h +++ b/source/blender/makesdna/DNA_dynamicpaint_types.h @@ -25,8 +25,8 @@ * \ingroup DNA */ -#ifndef DNA_DYNAMICPAINT_TYPES_H -#define DNA_DYNAMICPAINT_TYPES_H +#ifndef __DNA_DYNAMICPAINT_TYPES_H__ +#define __DNA_DYNAMICPAINT_TYPES_H__ #include "DNA_listBase.h" struct CurveMapping; diff --git a/source/blender/makesdna/DNA_effect_types.h b/source/blender/makesdna/DNA_effect_types.h index ddff22aae37..7ca3bbe3319 100644 --- a/source/blender/makesdna/DNA_effect_types.h +++ b/source/blender/makesdna/DNA_effect_types.h @@ -29,8 +29,8 @@ * \ingroup DNA */ -#ifndef DNA_EFFECT_TYPES_H -#define DNA_EFFECT_TYPES_H +#ifndef __DNA_EFFECT_TYPES_H__ +#define __DNA_EFFECT_TYPES_H__ /* don't forget, new effects also in writefile.c for dna!!! */ diff --git a/source/blender/makesdna/DNA_fileglobal_types.h b/source/blender/makesdna/DNA_fileglobal_types.h index ed9f3cec987..0ae5c2465da 100644 --- a/source/blender/makesdna/DNA_fileglobal_types.h +++ b/source/blender/makesdna/DNA_fileglobal_types.h @@ -29,8 +29,8 @@ * \ingroup DNA */ -#ifndef DNA_FILEGLOBAL_TYPES_H -#define DNA_FILEGLOBAL_TYPES_H +#ifndef __DNA_FILEGLOBAL_TYPES_H__ +#define __DNA_FILEGLOBAL_TYPES_H__ struct bScreen; struct Scene; diff --git a/source/blender/makesdna/DNA_genfile.h b/source/blender/makesdna/DNA_genfile.h index 2264e82b363..d4cfccaef70 100644 --- a/source/blender/makesdna/DNA_genfile.h +++ b/source/blender/makesdna/DNA_genfile.h @@ -30,8 +30,8 @@ * \brief blenloader genfile private function prototypes */ -#ifndef DNA_GENFILE_H -#define DNA_GENFILE_H +#ifndef __DNA_GENFILE_H__ +#define __DNA_GENFILE_H__ struct SDNA; diff --git a/source/blender/makesdna/DNA_gpencil_types.h b/source/blender/makesdna/DNA_gpencil_types.h index 71f0dbb60b1..6f3014c0961 100644 --- a/source/blender/makesdna/DNA_gpencil_types.h +++ b/source/blender/makesdna/DNA_gpencil_types.h @@ -27,8 +27,8 @@ * \ingroup DNA */ -#ifndef DNA_GPENCIL_TYPES_H -#define DNA_GPENCIL_TYPES_H +#ifndef __DNA_GPENCIL_TYPES_H__ +#define __DNA_GPENCIL_TYPES_H__ #include "DNA_listBase.h" #include "DNA_ID.h" @@ -160,4 +160,4 @@ typedef struct bGPdata { #define GP_DATA_DEPTH_STROKE_ENDPOINTS (1<<7) -#endif /* DNA_GPENCIL_TYPES_H */ +#endif /* __DNA_GPENCIL_TYPES_H__ */ diff --git a/source/blender/makesdna/DNA_group_types.h b/source/blender/makesdna/DNA_group_types.h index ab42086d6d0..8aa6de4fbe2 100644 --- a/source/blender/makesdna/DNA_group_types.h +++ b/source/blender/makesdna/DNA_group_types.h @@ -32,8 +32,8 @@ * \ingroup DNA */ -#ifndef DNA_GROUP_TYPES_H -#define DNA_GROUP_TYPES_H +#ifndef __DNA_GROUP_TYPES_H__ +#define __DNA_GROUP_TYPES_H__ #include "DNA_listBase.h" #include "DNA_ID.h" diff --git a/source/blender/makesdna/DNA_image_types.h b/source/blender/makesdna/DNA_image_types.h index 8f6cc5bf354..de2c9919df0 100644 --- a/source/blender/makesdna/DNA_image_types.h +++ b/source/blender/makesdna/DNA_image_types.h @@ -29,8 +29,8 @@ * \ingroup DNA */ -#ifndef DNA_IMAGE_TYPES_H -#define DNA_IMAGE_TYPES_H +#ifndef __DNA_IMAGE_TYPES_H__ +#define __DNA_IMAGE_TYPES_H__ #include "DNA_ID.h" diff --git a/source/blender/makesdna/DNA_ipo_types.h b/source/blender/makesdna/DNA_ipo_types.h index 201ea8994ca..e3ab6b4a7db 100644 --- a/source/blender/makesdna/DNA_ipo_types.h +++ b/source/blender/makesdna/DNA_ipo_types.h @@ -33,8 +33,8 @@ * etc. are only still maintained to provide backwards compatibility for old files. */ -#ifndef DNA_IPO_TYPES_H -#define DNA_IPO_TYPES_H +#ifndef __DNA_IPO_TYPES_H__ +#define __DNA_IPO_TYPES_H__ #include "DNA_listBase.h" #include "DNA_curve_types.h" diff --git a/source/blender/makesdna/DNA_key_types.h b/source/blender/makesdna/DNA_key_types.h index b64389a365c..d27ec513cc1 100644 --- a/source/blender/makesdna/DNA_key_types.h +++ b/source/blender/makesdna/DNA_key_types.h @@ -24,8 +24,8 @@ * * ***** END GPL LICENSE BLOCK ***** */ -#ifndef DNA_KEY_TYPES_H -#define DNA_KEY_TYPES_H +#ifndef __DNA_KEY_TYPES_H__ +#define __DNA_KEY_TYPES_H__ /** \file DNA_key_types.h * \ingroup DNA diff --git a/source/blender/makesdna/DNA_lamp_types.h b/source/blender/makesdna/DNA_lamp_types.h index 18fbde8a3c3..8cf3814ada1 100644 --- a/source/blender/makesdna/DNA_lamp_types.h +++ b/source/blender/makesdna/DNA_lamp_types.h @@ -29,8 +29,8 @@ * \ingroup DNA */ -#ifndef DNA_LAMP_TYPES_H -#define DNA_LAMP_TYPES_H +#ifndef __DNA_LAMP_TYPES_H__ +#define __DNA_LAMP_TYPES_H__ #include "DNA_defs.h" #include "DNA_ID.h" @@ -206,5 +206,5 @@ typedef struct Lamp { #define LAMAP_SHAD 2 -#endif /* DNA_LAMP_TYPES_H */ +#endif /* __DNA_LAMP_TYPES_H__ */ diff --git a/source/blender/makesdna/DNA_lattice_types.h b/source/blender/makesdna/DNA_lattice_types.h index 0a73ed5b24f..1b4bd53151b 100644 --- a/source/blender/makesdna/DNA_lattice_types.h +++ b/source/blender/makesdna/DNA_lattice_types.h @@ -29,8 +29,8 @@ * \ingroup DNA */ -#ifndef DNA_LATTICE_TYPES_H -#define DNA_LATTICE_TYPES_H +#ifndef __DNA_LATTICE_TYPES_H__ +#define __DNA_LATTICE_TYPES_H__ #include "DNA_defs.h" #include "DNA_ID.h" diff --git a/source/blender/makesdna/DNA_listBase.h b/source/blender/makesdna/DNA_listBase.h index 99ad6f41e96..d0e7a2f4433 100644 --- a/source/blender/makesdna/DNA_listBase.h +++ b/source/blender/makesdna/DNA_listBase.h @@ -33,8 +33,8 @@ * library system. */ -#ifndef DNA_LISTBASE_H -#define DNA_LISTBASE_H +#ifndef __DNA_LISTBASE_H__ +#define __DNA_LISTBASE_H__ #ifdef __cplusplus extern "C" { diff --git a/source/blender/makesdna/DNA_material_types.h b/source/blender/makesdna/DNA_material_types.h index eacc1b222e4..b58ae921200 100644 --- a/source/blender/makesdna/DNA_material_types.h +++ b/source/blender/makesdna/DNA_material_types.h @@ -29,8 +29,8 @@ * \ingroup DNA */ -#ifndef DNA_MATERIAL_TYPES_H -#define DNA_MATERIAL_TYPES_H +#ifndef __DNA_MATERIAL_TYPES_H__ +#define __DNA_MATERIAL_TYPES_H__ #include "DNA_defs.h" #include "DNA_ID.h" diff --git a/source/blender/makesdna/DNA_mesh_types.h b/source/blender/makesdna/DNA_mesh_types.h index 1dc96190c67..d15cf4f1871 100644 --- a/source/blender/makesdna/DNA_mesh_types.h +++ b/source/blender/makesdna/DNA_mesh_types.h @@ -29,8 +29,8 @@ * \ingroup DNA */ -#ifndef DNA_MESH_TYPES_H -#define DNA_MESH_TYPES_H +#ifndef __DNA_MESH_TYPES_H__ +#define __DNA_MESH_TYPES_H__ #include "DNA_defs.h" #include "DNA_listBase.h" diff --git a/source/blender/makesdna/DNA_meshdata_types.h b/source/blender/makesdna/DNA_meshdata_types.h index ce9d1538fed..e85e703cd27 100644 --- a/source/blender/makesdna/DNA_meshdata_types.h +++ b/source/blender/makesdna/DNA_meshdata_types.h @@ -29,8 +29,8 @@ * \ingroup DNA */ -#ifndef DNA_MESHDATA_TYPES_H -#define DNA_MESHDATA_TYPES_H +#ifndef __DNA_MESHDATA_TYPES_H__ +#define __DNA_MESHDATA_TYPES_H__ #include "DNA_customdata_types.h" #include "DNA_listBase.h" diff --git a/source/blender/makesdna/DNA_meta_types.h b/source/blender/makesdna/DNA_meta_types.h index 863e2b2e6ed..9c20b8f644b 100644 --- a/source/blender/makesdna/DNA_meta_types.h +++ b/source/blender/makesdna/DNA_meta_types.h @@ -29,8 +29,8 @@ * \ingroup DNA */ -#ifndef DNA_META_TYPES_H -#define DNA_META_TYPES_H +#ifndef __DNA_META_TYPES_H__ +#define __DNA_META_TYPES_H__ #include "DNA_listBase.h" #include "DNA_ID.h" diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h index dca401f12e8..0899b77abbc 100644 --- a/source/blender/makesdna/DNA_modifier_types.h +++ b/source/blender/makesdna/DNA_modifier_types.h @@ -22,8 +22,8 @@ * \ingroup DNA */ -#ifndef DNA_MODIFIER_TYPES_H -#define DNA_MODIFIER_TYPES_H +#ifndef __DNA_MODIFIER_TYPES_H__ +#define __DNA_MODIFIER_TYPES_H__ #include "DNA_defs.h" #include "DNA_listBase.h" diff --git a/source/blender/makesdna/DNA_movieclip_types.h b/source/blender/makesdna/DNA_movieclip_types.h index 71029293d09..be189e883c7 100644 --- a/source/blender/makesdna/DNA_movieclip_types.h +++ b/source/blender/makesdna/DNA_movieclip_types.h @@ -32,8 +32,8 @@ * \author Sergey Sharybin */ -#ifndef DNA_MOVIECLIP_TYPES_H -#define DNA_MOVIECLIP_TYPES_H +#ifndef __DNA_MOVIECLIP_TYPES_H__ +#define __DNA_MOVIECLIP_TYPES_H__ #include "DNA_ID.h" #include "DNA_tracking_types.h" diff --git a/source/blender/makesdna/DNA_nla_types.h b/source/blender/makesdna/DNA_nla_types.h index a28097e8449..43b52ed65eb 100644 --- a/source/blender/makesdna/DNA_nla_types.h +++ b/source/blender/makesdna/DNA_nla_types.h @@ -29,8 +29,8 @@ * \ingroup DNA */ -#ifndef DNA_NLA_TYPES_H -#define DNA_NLA_TYPES_H +#ifndef __DNA_NLA_TYPES_H__ +#define __DNA_NLA_TYPES_H__ #include "DNA_listBase.h" diff --git a/source/blender/makesdna/DNA_node_types.h b/source/blender/makesdna/DNA_node_types.h index 33ac75912fa..361aca4a572 100644 --- a/source/blender/makesdna/DNA_node_types.h +++ b/source/blender/makesdna/DNA_node_types.h @@ -29,8 +29,8 @@ * \ingroup DNA */ -#ifndef DNA_NODE_TYPES_H -#define DNA_NODE_TYPES_H +#ifndef __DNA_NODE_TYPES_H__ +#define __DNA_NODE_TYPES_H__ #include "DNA_ID.h" #include "DNA_vec_types.h" diff --git a/source/blender/makesdna/DNA_object_fluidsim.h b/source/blender/makesdna/DNA_object_fluidsim.h index 0651f076096..751d420daa7 100644 --- a/source/blender/makesdna/DNA_object_fluidsim.h +++ b/source/blender/makesdna/DNA_object_fluidsim.h @@ -31,8 +31,8 @@ * \ingroup DNA */ -#ifndef DNA_OBJECT_FLUIDSIM_H -#define DNA_OBJECT_FLUIDSIM_H +#ifndef __DNA_OBJECT_FLUIDSIM_H__ +#define __DNA_OBJECT_FLUIDSIM_H__ #include "DNA_ID.h" diff --git a/source/blender/makesdna/DNA_object_force.h b/source/blender/makesdna/DNA_object_force.h index 70aeaaacd44..6603288912b 100644 --- a/source/blender/makesdna/DNA_object_force.h +++ b/source/blender/makesdna/DNA_object_force.h @@ -31,8 +31,8 @@ * \ingroup DNA */ -#ifndef DNA_OBJECT_FORCE_H -#define DNA_OBJECT_FORCE_H +#ifndef __DNA_OBJECT_FORCE_H__ +#define __DNA_OBJECT_FORCE_H__ #ifdef __cplusplus extern "C" { diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h index b8580b47269..7d3662c7ffb 100644 --- a/source/blender/makesdna/DNA_object_types.h +++ b/source/blender/makesdna/DNA_object_types.h @@ -30,8 +30,8 @@ * \brief Object is a sort of wrapper for general info. */ -#ifndef DNA_OBJECT_TYPES_H -#define DNA_OBJECT_TYPES_H +#ifndef __DNA_OBJECT_TYPES_H__ +#define __DNA_OBJECT_TYPES_H__ #include "DNA_defs.h" #include "DNA_listBase.h" diff --git a/source/blender/makesdna/DNA_outliner_types.h b/source/blender/makesdna/DNA_outliner_types.h index ee3903c3b40..17124a724fe 100644 --- a/source/blender/makesdna/DNA_outliner_types.h +++ b/source/blender/makesdna/DNA_outliner_types.h @@ -29,8 +29,8 @@ * \ingroup DNA */ -#ifndef DNA_OUTLINER_TYPES_H -#define DNA_OUTLINER_TYPES_H +#ifndef __DNA_OUTLINER_TYPES_H__ +#define __DNA_OUTLINER_TYPES_H__ #include "DNA_listBase.h" diff --git a/source/blender/makesdna/DNA_packedFile_types.h b/source/blender/makesdna/DNA_packedFile_types.h index 91134c2c575..339ac0f8c0d 100644 --- a/source/blender/makesdna/DNA_packedFile_types.h +++ b/source/blender/makesdna/DNA_packedFile_types.h @@ -31,8 +31,8 @@ * \since 12-oct-2000 nzc */ -#ifndef DNA_PACKEDFILE_TYPES_H -#define DNA_PACKEDFILE_TYPES_H +#ifndef __DNA_PACKEDFILE_TYPES_H__ +#define __DNA_PACKEDFILE_TYPES_H__ typedef struct PackedFile { int size; diff --git a/source/blender/makesdna/DNA_particle_types.h b/source/blender/makesdna/DNA_particle_types.h index 4c3279c6527..220ee69b442 100644 --- a/source/blender/makesdna/DNA_particle_types.h +++ b/source/blender/makesdna/DNA_particle_types.h @@ -29,8 +29,8 @@ * \ingroup DNA */ -#ifndef DNA_PARTICLE_TYPES_H -#define DNA_PARTICLE_TYPES_H +#ifndef __DNA_PARTICLE_TYPES_H__ +#define __DNA_PARTICLE_TYPES_H__ #include "DNA_defs.h" #include "DNA_ID.h" diff --git a/source/blender/makesdna/DNA_property_types.h b/source/blender/makesdna/DNA_property_types.h index a36e362632b..55fa50e3f63 100644 --- a/source/blender/makesdna/DNA_property_types.h +++ b/source/blender/makesdna/DNA_property_types.h @@ -36,8 +36,8 @@ * hierarchy here is a bit strange, and not desirable. */ -#ifndef DNA_PROPERTY_TYPES_H -#define DNA_PROPERTY_TYPES_H +#ifndef __DNA_PROPERTY_TYPES_H__ +#define __DNA_PROPERTY_TYPES_H__ /* ********************* PROPERTY ************************ */ diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index 1f42118dbc0..79d561fd2ea 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -29,8 +29,8 @@ * \ingroup DNA */ -#ifndef DNA_SCENE_TYPES_H -#define DNA_SCENE_TYPES_H +#ifndef __DNA_SCENE_TYPES_H__ +#define __DNA_SCENE_TYPES_H__ #include "DNA_defs.h" diff --git a/source/blender/makesdna/DNA_screen_types.h b/source/blender/makesdna/DNA_screen_types.h index 504c8da7612..75d9b91e9c8 100644 --- a/source/blender/makesdna/DNA_screen_types.h +++ b/source/blender/makesdna/DNA_screen_types.h @@ -27,8 +27,8 @@ * \ingroup DNA */ -#ifndef DNA_SCREEN_TYPES_H -#define DNA_SCREEN_TYPES_H +#ifndef __DNA_SCREEN_TYPES_H__ +#define __DNA_SCREEN_TYPES_H__ #include "DNA_listBase.h" #include "DNA_view2d_types.h" diff --git a/source/blender/makesdna/DNA_sdna_types.h b/source/blender/makesdna/DNA_sdna_types.h index 462ff8ce045..97b65235a29 100644 --- a/source/blender/makesdna/DNA_sdna_types.h +++ b/source/blender/makesdna/DNA_sdna_types.h @@ -29,8 +29,8 @@ * \ingroup DNA */ -#ifndef DNA_SDNA_H -#define DNA_SDNA_H +#ifndef __DNA_SDNA_TYPES_H__ +#define __DNA_SDNA_TYPES_H__ # # diff --git a/source/blender/makesdna/DNA_sensor_types.h b/source/blender/makesdna/DNA_sensor_types.h index 80f19b30079..05927e3a486 100644 --- a/source/blender/makesdna/DNA_sensor_types.h +++ b/source/blender/makesdna/DNA_sensor_types.h @@ -31,8 +31,8 @@ * \author nzc */ -#ifndef DNA_SENSOR_TYPES_H -#define DNA_SENSOR_TYPES_H +#ifndef __DNA_SENSOR_TYPES_H__ +#define __DNA_SENSOR_TYPES_H__ struct Object; struct Material; diff --git a/source/blender/makesdna/DNA_sequence_types.h b/source/blender/makesdna/DNA_sequence_types.h index 20399e541d7..cff4e539e6e 100644 --- a/source/blender/makesdna/DNA_sequence_types.h +++ b/source/blender/makesdna/DNA_sequence_types.h @@ -30,8 +30,8 @@ * \author nzc */ -#ifndef DNA_SEQUENCE_TYPES_H -#define DNA_SEQUENCE_TYPES_H +#ifndef __DNA_SEQUENCE_TYPES_H__ +#define __DNA_SEQUENCE_TYPES_H__ #include "DNA_defs.h" #include "DNA_listBase.h" diff --git a/source/blender/makesdna/DNA_smoke_types.h b/source/blender/makesdna/DNA_smoke_types.h index 753f1374774..894e1135c0d 100644 --- a/source/blender/makesdna/DNA_smoke_types.h +++ b/source/blender/makesdna/DNA_smoke_types.h @@ -29,8 +29,8 @@ * \ingroup DNA */ -#ifndef DNA_SMOKE_TYPES_H -#define DNA_SMOKE_TYPES_H +#ifndef __DNA_SMOKE_TYPES_H__ +#define __DNA_SMOKE_TYPES_H__ /* flags */ #define MOD_SMOKE_HIGHRES (1<<1) /* enable high resolution */ diff --git a/source/blender/makesdna/DNA_sound_types.h b/source/blender/makesdna/DNA_sound_types.h index 1dab9effa9e..1fab63f9d63 100644 --- a/source/blender/makesdna/DNA_sound_types.h +++ b/source/blender/makesdna/DNA_sound_types.h @@ -30,8 +30,8 @@ * \author nzc */ -#ifndef DNA_SOUND_TYPES_H -#define DNA_SOUND_TYPES_H +#ifndef __DNA_SOUND_TYPES_H__ +#define __DNA_SOUND_TYPES_H__ #include "DNA_listBase.h" #include "DNA_ID.h" diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h index 64d858bbcee..ed724ae5807 100644 --- a/source/blender/makesdna/DNA_space_types.h +++ b/source/blender/makesdna/DNA_space_types.h @@ -30,8 +30,8 @@ * \author nzc */ -#ifndef DNA_SPACE_TYPES_H -#define DNA_SPACE_TYPES_H +#ifndef __DNA_SPACE_TYPES_H__ +#define __DNA_SPACE_TYPES_H__ #include "DNA_defs.h" #include "DNA_listBase.h" diff --git a/source/blender/makesdna/DNA_speaker_types.h b/source/blender/makesdna/DNA_speaker_types.h index 2e8227f4f92..8ad987818ae 100644 --- a/source/blender/makesdna/DNA_speaker_types.h +++ b/source/blender/makesdna/DNA_speaker_types.h @@ -24,8 +24,8 @@ * \ingroup DNA */ -#ifndef DNA_SPEAKER_TYPES_H -#define DNA_SPEAKER_TYPES_H +#ifndef __DNA_SPEAKER_TYPES_H__ +#define __DNA_SPEAKER_TYPES_H__ #include "DNA_ID.h" @@ -64,5 +64,5 @@ typedef struct Speaker { #define SPK_MUTED (1<<1) #define SPK_RELATIVE (1<<2) -#endif /* DNA_SPEAKER_TYPES_H */ +#endif /* __DNA_SPEAKER_TYPES_H__ */ diff --git a/source/blender/makesdna/DNA_text_types.h b/source/blender/makesdna/DNA_text_types.h index 67f3c5288f6..cf26dae402d 100644 --- a/source/blender/makesdna/DNA_text_types.h +++ b/source/blender/makesdna/DNA_text_types.h @@ -30,8 +30,8 @@ * \author nzc */ -#ifndef DNA_TEXT_TYPES_H -#define DNA_TEXT_TYPES_H +#ifndef __DNA_TEXT_TYPES_H__ +#define __DNA_TEXT_TYPES_H__ #include "DNA_listBase.h" #include "DNA_ID.h" diff --git a/source/blender/makesdna/DNA_texture_types.h b/source/blender/makesdna/DNA_texture_types.h index de844fd2d7f..c6ffec2aff7 100644 --- a/source/blender/makesdna/DNA_texture_types.h +++ b/source/blender/makesdna/DNA_texture_types.h @@ -31,8 +31,8 @@ * \author nzc */ -#ifndef DNA_TEXTURE_TYPES_H -#define DNA_TEXTURE_TYPES_H +#ifndef __DNA_TEXTURE_TYPES_H__ +#define __DNA_TEXTURE_TYPES_H__ #include "DNA_defs.h" #include "DNA_ID.h" diff --git a/source/blender/makesdna/DNA_tracking_types.h b/source/blender/makesdna/DNA_tracking_types.h index e81344d7d51..03e731cf765 100644 --- a/source/blender/makesdna/DNA_tracking_types.h +++ b/source/blender/makesdna/DNA_tracking_types.h @@ -32,8 +32,8 @@ * \author Sergey Sharybin */ -#ifndef DNA_TRACKING_TYPES_H -#define DNA_TRACKING_TYPES_H +#ifndef __DNA_TRACKING_TYPES_H__ +#define __DNA_TRACKING_TYPES_H__ #include "DNA_listBase.h" diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h index 405e1e33720..d64c3133001 100644 --- a/source/blender/makesdna/DNA_userdef_types.h +++ b/source/blender/makesdna/DNA_userdef_types.h @@ -31,8 +31,8 @@ * \author nzc */ -#ifndef DNA_USERDEF_TYPES_H -#define DNA_USERDEF_TYPES_H +#ifndef __DNA_USERDEF_TYPES_H__ +#define __DNA_USERDEF_TYPES_H__ #include "DNA_listBase.h" #include "DNA_texture_types.h" /* ColorBand */ diff --git a/source/blender/makesdna/DNA_vec_types.h b/source/blender/makesdna/DNA_vec_types.h index 10135ba85e9..0e832b8c95f 100644 --- a/source/blender/makesdna/DNA_vec_types.h +++ b/source/blender/makesdna/DNA_vec_types.h @@ -32,8 +32,8 @@ * \author nzc */ -#ifndef DNA_VEC_TYPES_H -#define DNA_VEC_TYPES_H +#ifndef __DNA_VEC_TYPES_H__ +#define __DNA_VEC_TYPES_H__ /* types */ diff --git a/source/blender/makesdna/DNA_vfont_types.h b/source/blender/makesdna/DNA_vfont_types.h index d6168af6028..299a6540f40 100644 --- a/source/blender/makesdna/DNA_vfont_types.h +++ b/source/blender/makesdna/DNA_vfont_types.h @@ -31,8 +31,8 @@ * \author nzc */ -#ifndef DNA_VFONT_TYPES_H -#define DNA_VFONT_TYPES_H +#ifndef __DNA_VFONT_TYPES_H__ +#define __DNA_VFONT_TYPES_H__ #include "DNA_ID.h" diff --git a/source/blender/makesdna/DNA_view2d_types.h b/source/blender/makesdna/DNA_view2d_types.h index 0581cad4170..9c4abfbfdef 100644 --- a/source/blender/makesdna/DNA_view2d_types.h +++ b/source/blender/makesdna/DNA_view2d_types.h @@ -29,8 +29,8 @@ * \ingroup DNA */ -#ifndef DNA_VIEW2D_TYPES_H -#define DNA_VIEW2D_TYPES_H +#ifndef __DNA_VIEW2D_TYPES_H__ +#define __DNA_VIEW2D_TYPES_H__ #include "DNA_vec_types.h" diff --git a/source/blender/makesdna/DNA_view3d_types.h b/source/blender/makesdna/DNA_view3d_types.h index 58c3f091d6d..0758e6e1713 100644 --- a/source/blender/makesdna/DNA_view3d_types.h +++ b/source/blender/makesdna/DNA_view3d_types.h @@ -29,8 +29,8 @@ * \ingroup DNA */ -#ifndef DNA_VIEW3D_TYPES_H -#define DNA_VIEW3D_TYPES_H +#ifndef __DNA_VIEW3D_TYPES_H__ +#define __DNA_VIEW3D_TYPES_H__ struct ViewDepths; struct Object; diff --git a/source/blender/makesdna/DNA_windowmanager_types.h b/source/blender/makesdna/DNA_windowmanager_types.h index 156d2ebbb20..3e6c46ba8b1 100644 --- a/source/blender/makesdna/DNA_windowmanager_types.h +++ b/source/blender/makesdna/DNA_windowmanager_types.h @@ -28,8 +28,8 @@ * \ingroup DNA */ -#ifndef DNA_WINDOWMANAGER_TYPES_H -#define DNA_WINDOWMANAGER_TYPES_H +#ifndef __DNA_WINDOWMANAGER_TYPES_H__ +#define __DNA_WINDOWMANAGER_TYPES_H__ #include "DNA_listBase.h" #include "DNA_vec_types.h" @@ -338,4 +338,4 @@ typedef struct wmOperator { /* wmOperator flag */ #define OP_GRAB_POINTER 1 -#endif /* DNA_WINDOWMANAGER_TYPES_H */ +#endif /* __DNA_WINDOWMANAGER_TYPES_H__ */ diff --git a/source/blender/makesdna/DNA_world_types.h b/source/blender/makesdna/DNA_world_types.h index a04ea89a291..5482566ac41 100644 --- a/source/blender/makesdna/DNA_world_types.h +++ b/source/blender/makesdna/DNA_world_types.h @@ -29,8 +29,8 @@ * \ingroup DNA */ -#ifndef DNA_WORLD_TYPES_H -#define DNA_WORLD_TYPES_H +#ifndef __DNA_WORLD_TYPES_H__ +#define __DNA_WORLD_TYPES_H__ #include "DNA_defs.h" #include "DNA_ID.h" diff --git a/source/blender/makesrna/RNA_access.h b/source/blender/makesrna/RNA_access.h index 45510947757..dc342f47362 100644 --- a/source/blender/makesrna/RNA_access.h +++ b/source/blender/makesrna/RNA_access.h @@ -20,8 +20,8 @@ * ***** END GPL LICENSE BLOCK ***** */ -#ifndef RNA_ACCESS_H -#define RNA_ACCESS_H +#ifndef __RNA_ACCESS_H__ +#define __RNA_ACCESS_H__ /** \file RNA_access.h * \ingroup RNA @@ -1017,4 +1017,4 @@ __attribute__ ((format (printf, 1, 2))) } #endif -#endif /* RNA_ACCESS_H */ +#endif /* __RNA_ACCESS_H__ */ diff --git a/source/blender/makesrna/RNA_define.h b/source/blender/makesrna/RNA_define.h index 4fb08227fb6..95f988b470b 100644 --- a/source/blender/makesrna/RNA_define.h +++ b/source/blender/makesrna/RNA_define.h @@ -20,8 +20,8 @@ * ***** END GPL LICENSE BLOCK ***** */ -#ifndef RNA_DEFINE_H -#define RNA_DEFINE_H +#ifndef __RNA_DEFINE_H__ +#define __RNA_DEFINE_H__ /** \file RNA_define.h * \ingroup RNA @@ -218,5 +218,5 @@ const char *RNA_property_typename(PropertyType type); } #endif -#endif /* RNA_DEFINE_H */ +#endif /* __RNA_DEFINE_H__ */ diff --git a/source/blender/makesrna/RNA_enum_types.h b/source/blender/makesrna/RNA_enum_types.h index 72917600d05..a333d9ace12 100644 --- a/source/blender/makesrna/RNA_enum_types.h +++ b/source/blender/makesrna/RNA_enum_types.h @@ -20,8 +20,8 @@ * ***** END GPL LICENSE BLOCK ***** */ -#ifndef RNA_ENUM_TYPES_H -#define RNA_ENUM_TYPES_H +#ifndef __RNA_ENUM_TYPES_H__ +#define __RNA_ENUM_TYPES_H__ /** \file RNA_enum_types.h * \ingroup RNA @@ -137,4 +137,4 @@ EnumPropertyItem *RNA_image_local_itemf(struct bContext *C, struct PointerRNA *p EnumPropertyItem *RNA_scene_itemf(struct bContext *C, struct PointerRNA *ptr, struct PropertyRNA *prop, int *free); EnumPropertyItem *RNA_scene_local_itemf(struct bContext *C, struct PointerRNA *ptr, struct PropertyRNA *prop, int *free); -#endif /* RNA_ENUM_TYPES_H */ +#endif /* __RNA_ENUM_TYPES_H__ */ diff --git a/source/blender/makesrna/RNA_types.h b/source/blender/makesrna/RNA_types.h index 85869115e79..ee9c6b26e2f 100644 --- a/source/blender/makesrna/RNA_types.h +++ b/source/blender/makesrna/RNA_types.h @@ -27,8 +27,8 @@ #include "BLO_sys_types.h" -#ifndef RNA_TYPES_H -#define RNA_TYPES_H +#ifndef __RNA_TYPES_H__ +#define __RNA_TYPES_H__ #ifdef __cplusplus extern "C" { @@ -371,4 +371,4 @@ typedef struct ExtensionRNA { } #endif -#endif /* RNA_TYPES_H */ +#endif /* __RNA_TYPES_H__ */ diff --git a/source/blender/makesrna/intern/rna_internal.h b/source/blender/makesrna/intern/rna_internal.h index e9f8ecd1ef2..6d902ba037a 100644 --- a/source/blender/makesrna/intern/rna_internal.h +++ b/source/blender/makesrna/intern/rna_internal.h @@ -25,8 +25,8 @@ */ -#ifndef RNA_INTERNAL_H -#define RNA_INTERNAL_H +#ifndef __RNA_INTERNAL_H__ +#define __RNA_INTERNAL_H__ #include "UI_resources.h" @@ -387,6 +387,6 @@ void rna_mtex_texture_slots_clear(struct ID *self, struct bContext *C, struct Re int rna_IDMaterials_assign_int(struct PointerRNA *ptr, int key, const struct PointerRNA *assign_ptr); -#endif /* RNA_INTERNAL_H */ +#endif /* __RNA_INTERNAL_H__ */ diff --git a/source/blender/makesrna/intern/rna_internal_types.h b/source/blender/makesrna/intern/rna_internal_types.h index 40157d390bc..997f9d084c5 100644 --- a/source/blender/makesrna/intern/rna_internal_types.h +++ b/source/blender/makesrna/intern/rna_internal_types.h @@ -25,8 +25,8 @@ */ -#ifndef RNA_INTERNAL_TYPES_H -#define RNA_INTERNAL_TYPES_H +#ifndef __RNA_INTERNAL_TYPES_H__ +#define __RNA_INTERNAL_TYPES_H__ #include "DNA_listBase.h" @@ -358,4 +358,4 @@ struct BlenderRNA { #define CONTAINER_RNA_ID(cont) (*(const char **)(((ContainerRNA *)(cont))+1)) -#endif /* RNA_INTERNAL_TYPES_H */ +#endif /* __RNA_INTERNAL_TYPES_H__ */ diff --git a/source/blender/makesrna/intern/rna_nodetree_types.h b/source/blender/makesrna/intern/rna_nodetree_types.h index 2284b09e941..745a956d831 100644 --- a/source/blender/makesrna/intern/rna_nodetree_types.h +++ b/source/blender/makesrna/intern/rna_nodetree_types.h @@ -24,6 +24,7 @@ * \ingroup RNA */ +/* intentionally no include guard */ /* Empty definitions for undefined macros to avoid warnings */ #ifndef DefNode diff --git a/source/blender/modifiers/MOD_modifiertypes.h b/source/blender/modifiers/MOD_modifiertypes.h index fec6545678a..ea5574a378e 100644 --- a/source/blender/modifiers/MOD_modifiertypes.h +++ b/source/blender/modifiers/MOD_modifiertypes.h @@ -24,8 +24,8 @@ * \ingroup modifiers */ -#ifndef MOD_MODIFIERTYPES_H -#define MOD_MODIFIERTYPES_H +#ifndef __MOD_MODIFIERTYPES_H__ +#define __MOD_MODIFIERTYPES_H__ #include "BKE_modifier.h" @@ -78,4 +78,4 @@ extern ModifierTypeInfo modifierType_Remesh; /* MOD_util.c */ void modifier_type_init(ModifierTypeInfo *types[]); -#endif //MOD_MODIFIERTYPES_H +#endif //__MOD_MODIFIERTYPES_H__ diff --git a/source/blender/modifiers/intern/MOD_boolean_util.h b/source/blender/modifiers/intern/MOD_boolean_util.h index dcd5460c7c3..8e3617cf74e 100644 --- a/source/blender/modifiers/intern/MOD_boolean_util.h +++ b/source/blender/modifiers/intern/MOD_boolean_util.h @@ -30,8 +30,8 @@ */ -#ifndef MOD_BOOLEAN_UTILS_H -#define MOD_BOOLEAN_UTILS_H +#ifndef __MOD_BOOLEAN_UTIL_H__ +#define __MOD_BOOLEAN_UTIL_H__ struct Scene; struct Object; diff --git a/source/blender/modifiers/intern/MOD_fluidsim_util.h b/source/blender/modifiers/intern/MOD_fluidsim_util.h index 2c22f37bcbe..334826e618b 100644 --- a/source/blender/modifiers/intern/MOD_fluidsim_util.h +++ b/source/blender/modifiers/intern/MOD_fluidsim_util.h @@ -30,8 +30,8 @@ */ -#ifndef MOD_FLUIDSIM_UTIL_H -#define MOD_FLUIDSIM_UTIL_H +#ifndef __MOD_FLUIDSIM_UTIL_H__ +#define __MOD_FLUIDSIM_UTIL_H__ struct Object; struct Scene; diff --git a/source/blender/modifiers/intern/MOD_util.h b/source/blender/modifiers/intern/MOD_util.h index 86909efb96c..ad62e073ea2 100644 --- a/source/blender/modifiers/intern/MOD_util.h +++ b/source/blender/modifiers/intern/MOD_util.h @@ -25,8 +25,8 @@ */ -#ifndef MOD_UTIL_H -#define MOD_UTIL_H +#ifndef __MOD_UTIL_H__ +#define __MOD_UTIL_H__ /* so modifier types match their defines */ #include "MOD_modifiertypes.h" @@ -48,4 +48,4 @@ struct DerivedMesh *get_cddm(struct Object *ob, struct EditMesh *em, struct Deri struct DerivedMesh *get_dm(struct Object *ob, struct EditMesh *em, struct DerivedMesh *dm, float (*vertexCos)[3], int orco); void modifier_get_vgroup(struct Object *ob, struct DerivedMesh *dm, const char *name, struct MDeformVert **dvert, int *defgrp_index); -#endif /* MOD_UTIL_H */ +#endif /* __MOD_UTIL_H__ */ diff --git a/source/blender/modifiers/intern/MOD_weightvg_util.h b/source/blender/modifiers/intern/MOD_weightvg_util.h index 5ae1e991073..5572628fd3f 100644 --- a/source/blender/modifiers/intern/MOD_weightvg_util.h +++ b/source/blender/modifiers/intern/MOD_weightvg_util.h @@ -29,8 +29,8 @@ */ -#ifndef MOD_WEIGHTVG_UTIL_H -#define MOD_WEIGHTVG_UTIL_H +#ifndef __MOD_WEIGHTVG_UTIL_H__ +#define __MOD_WEIGHTVG_UTIL_H__ /* so modifier types match their defines */ #include "MOD_modifiertypes.h" @@ -85,4 +85,4 @@ void weightvg_update_vg(MDeformVert *dvert, int defgrp_idx, MDeformWeight **dws, const int *indices, const float *weights, int do_add, float add_thresh, int do_rem, float rem_thresh); -#endif /* MOD_WEIGHTVG_UTIL_H */ +#endif /* __MOD_WEIGHTVG_UTIL_H__ */ diff --git a/source/blender/nodes/NOD_composite.h b/source/blender/nodes/NOD_composite.h index 77745a19934..284b89bc095 100644 --- a/source/blender/nodes/NOD_composite.h +++ b/source/blender/nodes/NOD_composite.h @@ -29,8 +29,8 @@ * \ingroup nodes */ -#ifndef NOD_composite_H -#define NOD_composite_H +#ifndef __NOD_COMPOSITE_H__ +#define __NOD_COMPOSITE_H__ #include "BKE_node.h" diff --git a/source/blender/nodes/NOD_shader.h b/source/blender/nodes/NOD_shader.h index 63fc0f4232c..d2b3a61971b 100644 --- a/source/blender/nodes/NOD_shader.h +++ b/source/blender/nodes/NOD_shader.h @@ -29,8 +29,8 @@ * \ingroup nodes */ -#ifndef NOD_SHADER_H -#define NOD_SHADER_H +#ifndef __NOD_SHADER_H__ +#define __NOD_SHADER_H__ #include "BKE_node.h" diff --git a/source/blender/nodes/NOD_socket.h b/source/blender/nodes/NOD_socket.h index fb3946bae6c..f41be2bb7d9 100644 --- a/source/blender/nodes/NOD_socket.h +++ b/source/blender/nodes/NOD_socket.h @@ -30,8 +30,8 @@ */ -#ifndef NOD_SOCKET_H_ -#define NOD_SOCKET_H_ +#ifndef __NOD_SOCKET_H__ +#define __NOD_SOCKET_H__ #include "DNA_listBase.h" diff --git a/source/blender/nodes/NOD_texture.h b/source/blender/nodes/NOD_texture.h index cb727ef071a..7722580d136 100644 --- a/source/blender/nodes/NOD_texture.h +++ b/source/blender/nodes/NOD_texture.h @@ -29,8 +29,8 @@ * \ingroup nodes */ -#ifndef NOD_TEXTURE_H -#define NOD_TEXTURE_H +#ifndef __NOD_TEXTURE_H__ +#define __NOD_TEXTURE_H__ #include "BKE_node.h" diff --git a/source/blender/nodes/composite/node_composite_util.h b/source/blender/nodes/composite/node_composite_util.h index 02487933849..5e63750e131 100644 --- a/source/blender/nodes/composite/node_composite_util.h +++ b/source/blender/nodes/composite/node_composite_util.h @@ -30,8 +30,8 @@ */ -#ifndef NODE_COMPOSITE_UTIL_H_ -#define NODE_COMPOSITE_UTIL_H_ +#ifndef __NODE_COMPOSITE_UTIL_H__ +#define __NODE_COMPOSITE_UTIL_H__ #include <stdlib.h> #include <string.h> diff --git a/source/blender/nodes/intern/node_common.h b/source/blender/nodes/intern/node_common.h index ee523120d02..616221d6658 100644 --- a/source/blender/nodes/intern/node_common.h +++ b/source/blender/nodes/intern/node_common.h @@ -30,8 +30,8 @@ */ -#ifndef NODE_COMMON_H_ -#define NODE_COMMON_H_ +#ifndef __NODE_COMMON_H__ +#define __NODE_COMMON_H__ #include "DNA_listBase.h" diff --git a/source/blender/nodes/intern/node_exec.h b/source/blender/nodes/intern/node_exec.h index fe1bb0b6eb6..1003206e96a 100644 --- a/source/blender/nodes/intern/node_exec.h +++ b/source/blender/nodes/intern/node_exec.h @@ -30,8 +30,8 @@ */ -#ifndef NODE_EXEC_H_ -#define NODE_EXEC_H_ +#ifndef __NODE_EXEC_H__ +#define __NODE_EXEC_H__ #include "DNA_listBase.h" diff --git a/source/blender/nodes/intern/node_util.h b/source/blender/nodes/intern/node_util.h index 7ca090394c3..4a5e8765ba2 100644 --- a/source/blender/nodes/intern/node_util.h +++ b/source/blender/nodes/intern/node_util.h @@ -30,8 +30,8 @@ */ -#ifndef NODE_UTIL_H_ -#define NODE_UTIL_H_ +#ifndef __NODE_UTIL_H__ +#define __NODE_UTIL_H__ #include "DNA_listBase.h" diff --git a/source/blender/nodes/shader/node_shader_util.h b/source/blender/nodes/shader/node_shader_util.h index d345f3fb310..76d3d933fdb 100644 --- a/source/blender/nodes/shader/node_shader_util.h +++ b/source/blender/nodes/shader/node_shader_util.h @@ -30,8 +30,8 @@ */ -#ifndef NODE_SHADER_UTIL_H_ -#define NODE_SHADER_UTIL_H_ +#ifndef __NODE_SHADER_UTIL_H__ +#define __NODE_SHADER_UTIL_H__ #include <math.h> #include <float.h> diff --git a/source/blender/nodes/texture/node_texture_util.h b/source/blender/nodes/texture/node_texture_util.h index 5095a9799e4..a0b219804b9 100644 --- a/source/blender/nodes/texture/node_texture_util.h +++ b/source/blender/nodes/texture/node_texture_util.h @@ -30,8 +30,8 @@ */ -#ifndef NODE_TEXTURE_UTIL_H_ -#define NODE_TEXTURE_UTIL_H_ +#ifndef __NODE_TEXTURE_UTIL_H__ +#define __NODE_TEXTURE_UTIL_H__ #include <math.h> #include <string.h> diff --git a/source/blender/python/BPY_extern.h b/source/blender/python/BPY_extern.h index 51f9063c289..33ea139b474 100644 --- a/source/blender/python/BPY_extern.h +++ b/source/blender/python/BPY_extern.h @@ -34,8 +34,8 @@ -#ifndef BPY_EXTERN_H -#define BPY_EXTERN_H +#ifndef __BPY_EXTERN_H__ +#define __BPY_EXTERN_H__ struct Text; /* defined in DNA_text_types.h */ struct ID; /* DNA_ID.h */ @@ -89,4 +89,4 @@ void BPY_id_release(struct ID *id); } /* extern "C" */ #endif -#endif /* BPY_EXTERN_H */ +#endif /* __BPY_EXTERN_H__ */ diff --git a/source/blender/python/generic/bgl.h b/source/blender/python/generic/bgl.h index 2e02900d69f..e23f4c2e86d 100644 --- a/source/blender/python/generic/bgl.h +++ b/source/blender/python/generic/bgl.h @@ -36,8 +36,8 @@ * writers to make OpenGL calls in their Python scripts for Blender. The * more important original comments are marked with an @ symbol. */ -#ifndef BGL_H -#define BGL_H +#ifndef __BGL_H__ +#define __BGL_H__ PyObject *BPyInit_bgl(void); @@ -339,4 +339,4 @@ extern PyTypeObject BGL_bufferType; return NULL; \ } \ -#endif /* BGL_H */ +#endif /* __BGL_H__ */ diff --git a/source/blender/python/generic/bpy_internal_import.h b/source/blender/python/generic/bpy_internal_import.h index 2ce644715e9..8b41a575d96 100644 --- a/source/blender/python/generic/bpy_internal_import.h +++ b/source/blender/python/generic/bpy_internal_import.h @@ -32,8 +32,8 @@ /* Note, the BGE needs to use this too, keep it minimal */ -#ifndef BPY_INTERNAL_IMPORT_H -#define BPY_INTERNAL_IMPORT_H +#ifndef __BPY_INTERNAL_IMPORT_H__ +#define __BPY_INTERNAL_IMPORT_H__ /* python redefines :/ */ #ifdef _POSIX_C_SOURCE @@ -62,4 +62,4 @@ extern PyMethodDef bpy_reload_meth; struct Main *bpy_import_main_get(void); void bpy_import_main_set(struct Main *maggie); -#endif /* BPY_INTERNAL_IMPORT_H */ +#endif /* __BPY_INTERNAL_IMPORT_H__ */ diff --git a/source/blender/python/generic/idprop_py_api.h b/source/blender/python/generic/idprop_py_api.h index 599ba8e1db6..f053f212a23 100644 --- a/source/blender/python/generic/idprop_py_api.h +++ b/source/blender/python/generic/idprop_py_api.h @@ -25,8 +25,8 @@ */ -#ifndef PY_IDPROP_API_H -#define PY_IDPROP_API_H +#ifndef __IDPROP_PY_API_H__ +#define __IDPROP_PY_API_H__ struct ID; struct IDProperty; @@ -67,4 +67,4 @@ void IDProp_Init_Types(void); #define IDPROP_ITER_KEYS 0 #define IDPROP_ITER_ITEMS 1 -#endif /* PY_IDPROP_API_H */ +#endif /* __IDPROP_PY_API_H__ */ diff --git a/source/blender/python/generic/py_capi_utils.h b/source/blender/python/generic/py_capi_utils.h index 2cab464a9d7..a71a2821c9a 100644 --- a/source/blender/python/generic/py_capi_utils.h +++ b/source/blender/python/generic/py_capi_utils.h @@ -25,8 +25,8 @@ */ -#ifndef PY_CAPI_UTILS_H -#define PY_CAPI_UTILS_H +#ifndef __PY_CAPI_UTILS_H__ +#define __PY_CAPI_UTILS_H__ void PyC_ObSpit(const char *name, PyObject *var); void PyC_LineSpit(void); @@ -54,4 +54,4 @@ void PyC_SetHomePath(const char *py_path_bundle); #define PYC_INTERPRETER_ACTIVE (((PyThreadState*)_Py_atomic_load_relaxed(&_PyThreadState_Current)) != NULL) -#endif // PY_CAPI_UTILS_H +#endif // __PY_CAPI_UTILS_H__ diff --git a/source/blender/python/intern/bpy_app.h b/source/blender/python/intern/bpy_app.h index 0aa3b1f4e42..5bf36f04ba0 100644 --- a/source/blender/python/intern/bpy_app.h +++ b/source/blender/python/intern/bpy_app.h @@ -24,9 +24,9 @@ * \ingroup pythonintern */ -#ifndef BPY_APP_H -#define BPY_APP_H +#ifndef __BPY_APP_H__ +#define __BPY_APP_H__ PyObject *BPY_app_struct(void); -#endif // BPY_APP_H +#endif // __BPY_APP_H__ diff --git a/source/blender/python/intern/bpy_app_ffmpeg.h b/source/blender/python/intern/bpy_app_ffmpeg.h index 4ed89cd7902..cadbb021d31 100644 --- a/source/blender/python/intern/bpy_app_ffmpeg.h +++ b/source/blender/python/intern/bpy_app_ffmpeg.h @@ -24,9 +24,9 @@ * \ingroup pythonintern */ -#ifndef BPY_APP_FFMPEG_H -#define BPY_APP_FFMPEG_H +#ifndef __BPY_APP_FFMPEG_H__ +#define __BPY_APP_FFMPEG_H__ PyObject *BPY_app_ffmpeg_struct(void); -#endif // BPY_APP_FFMPEG_H +#endif // __BPY_APP_FFMPEG_H__ diff --git a/source/blender/python/intern/bpy_app_handlers.h b/source/blender/python/intern/bpy_app_handlers.h index 873282bde79..6883e05859d 100644 --- a/source/blender/python/intern/bpy_app_handlers.h +++ b/source/blender/python/intern/bpy_app_handlers.h @@ -24,10 +24,10 @@ * \ingroup pythonintern */ -#ifndef BPY_APP_HANDLERS_H -#define BPY_APP_HANDLERS_H +#ifndef __BPY_APP_HANDLERS_H__ +#define __BPY_APP_HANDLERS_H__ PyObject *BPY_app_handlers_struct(void); void BPY_app_handlers_clear(void); -#endif // BPY_APP_HANDLERS_H +#endif // __BPY_APP_HANDLERS_H__ diff --git a/source/blender/python/intern/bpy_driver.h b/source/blender/python/intern/bpy_driver.h index 802a3649e20..6d1696d6cdc 100644 --- a/source/blender/python/intern/bpy_driver.h +++ b/source/blender/python/intern/bpy_driver.h @@ -24,8 +24,8 @@ * \ingroup pythonintern */ -#ifndef BPY_DRIVER_H -#define BPY_DRIVER_H +#ifndef __BPY_DRIVER_H__ +#define __BPY_DRIVER_H__ struct ChannelDriver; @@ -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__ diff --git a/source/blender/python/intern/bpy_operator.h b/source/blender/python/intern/bpy_operator.h index cf67f2a029d..68ea9423edd 100644 --- a/source/blender/python/intern/bpy_operator.h +++ b/source/blender/python/intern/bpy_operator.h @@ -24,8 +24,8 @@ * \ingroup pythonintern */ -#ifndef BPY_OPERATOR_H -#define BPY_OPERATOR_H +#ifndef __BPY_OPERATOR_H__ +#define __BPY_OPERATOR_H__ extern PyTypeObject pyop_base_Type; diff --git a/source/blender/python/intern/bpy_operator_wrap.h b/source/blender/python/intern/bpy_operator_wrap.h index 125d7dba84a..05a566a1485 100644 --- a/source/blender/python/intern/bpy_operator_wrap.h +++ b/source/blender/python/intern/bpy_operator_wrap.h @@ -24,8 +24,8 @@ * \ingroup pythonintern */ -#ifndef BPY_OPERATOR_WRAP_H -#define BPY_OPERATOR_WRAP_H +#ifndef __BPY_OPERATOR_WRAP_H__ +#define __BPY_OPERATOR_WRAP_H__ struct wmOperatorType; diff --git a/source/blender/python/intern/bpy_props.h b/source/blender/python/intern/bpy_props.h index f7ec6d555b9..c9934ca0cf3 100644 --- a/source/blender/python/intern/bpy_props.h +++ b/source/blender/python/intern/bpy_props.h @@ -25,8 +25,8 @@ */ -#ifndef BPY_PROPS_H -#define BPY_PROPS_H +#ifndef __BPY_PROPS_H__ +#define __BPY_PROPS_H__ PyObject *BPY_rna_props(void); diff --git a/source/blender/python/intern/bpy_rna.h b/source/blender/python/intern/bpy_rna.h index 70ae8166b8b..c9ff034716d 100644 --- a/source/blender/python/intern/bpy_rna.h +++ b/source/blender/python/intern/bpy_rna.h @@ -24,8 +24,8 @@ * \ingroup pythonintern */ -#ifndef BPY_RNA_H -#define BPY_RNA_H +#ifndef __BPY_RNA_H__ +#define __BPY_RNA_H__ /* --- bpy build options --- */ #ifdef WITH_PYTHON_SAFETY diff --git a/source/blender/python/intern/bpy_traceback.h b/source/blender/python/intern/bpy_traceback.h index ff7312bb16e..575f9824379 100644 --- a/source/blender/python/intern/bpy_traceback.h +++ b/source/blender/python/intern/bpy_traceback.h @@ -23,9 +23,9 @@ */ -#ifndef BPY_TRACEBACK_H -#define BPY_TRACEBACK_H +#ifndef __BPY_TRACEBACK_H__ +#define __BPY_TRACEBACK_H__ void python_script_error_jump(const char *filepath, int *lineno, int *offset); -#endif // BPY_TRACEBACK_H +#endif // __BPY_TRACEBACK_H__ diff --git a/source/blender/python/intern/bpy_util.h b/source/blender/python/intern/bpy_util.h index 4c06bd2593b..4bebcb2ed85 100644 --- a/source/blender/python/intern/bpy_util.h +++ b/source/blender/python/intern/bpy_util.h @@ -25,8 +25,8 @@ */ -#ifndef BPY_UTIL_H -#define BPY_UTIL_H +#ifndef __BPY_UTIL_H__ +#define __BPY_UTIL_H__ #if PY_VERSION_HEX < 0x03020000 #error "Python 3.2 or greater is required, you'll need to update your python." diff --git a/source/blender/python/mathutils/mathutils.h b/source/blender/python/mathutils/mathutils.h index 220ae61f47d..854cb2e962a 100644 --- a/source/blender/python/mathutils/mathutils.h +++ b/source/blender/python/mathutils/mathutils.h @@ -32,8 +32,8 @@ //Include this file for access to vector, quat, matrix, euler, etc... -#ifndef MATHUTILS_H -#define MATHUTILS_H +#ifndef __MATHUTILS_H__ +#define __MATHUTILS_H__ /* Can cast different mathutils types to this, use for generic funcs */ @@ -125,4 +125,4 @@ int column_vector_multiplication(float rvec[4], VectorObject *vec, MatrixObject /* dynstr as python string utility funcions */ PyObject *mathutils_dynstr_to_py(struct DynStr *ds); -#endif /* MATHUTILS_H */ +#endif /* __MATHUTILS_H__ */ diff --git a/source/blender/python/mathutils/mathutils_Color.h b/source/blender/python/mathutils/mathutils_Color.h index 7e8a99089ad..786afeed5da 100644 --- a/source/blender/python/mathutils/mathutils_Color.h +++ b/source/blender/python/mathutils/mathutils_Color.h @@ -32,8 +32,8 @@ */ -#ifndef MATHUTILS_COLOR_H -#define MATHUTILS_COLOR_H +#ifndef __MATHUTILS_COLOR_H__ +#define __MATHUTILS_COLOR_H__ extern PyTypeObject color_Type; #define ColorObject_Check(_v) PyObject_TypeCheck((_v), &color_Type) @@ -51,4 +51,4 @@ blender (stored in blend_data). This is an either/or struct not both*/ PyObject *Color_CreatePyObject( float *col, int type, PyTypeObject *base_type); PyObject *Color_CreatePyObject_cb(PyObject *cb_user, int cb_type, int cb_subtype); -#endif /* MATHUTILS_COLOR_H */ +#endif /* __MATHUTILS_COLOR_H__ */ diff --git a/source/blender/python/mathutils/mathutils_Euler.h b/source/blender/python/mathutils/mathutils_Euler.h index c42b0daffbc..3656aa14461 100644 --- a/source/blender/python/mathutils/mathutils_Euler.h +++ b/source/blender/python/mathutils/mathutils_Euler.h @@ -32,8 +32,8 @@ */ -#ifndef MATHUTILS_EULER_H -#define MATHUTILS_EULER_H +#ifndef __MATHUTILS_EULER_H__ +#define __MATHUTILS_EULER_H__ extern PyTypeObject euler_Type; #define EulerObject_Check(_v) PyObject_TypeCheck((_v), &euler_Type) @@ -56,4 +56,4 @@ PyObject *Euler_CreatePyObject_cb(PyObject *cb_user, short order, int cb_type, i short euler_order_from_string(const char *str, const char *error_prefix); -#endif /* MATHUTILS_EULER_H */ +#endif /* __MATHUTILS_EULER_H__ */ diff --git a/source/blender/python/mathutils/mathutils_Matrix.h b/source/blender/python/mathutils/mathutils_Matrix.h index 2ecbc55da35..e8719e947ec 100644 --- a/source/blender/python/mathutils/mathutils_Matrix.h +++ b/source/blender/python/mathutils/mathutils_Matrix.h @@ -31,8 +31,8 @@ */ -#ifndef MATHUTILS_MATRIX_H -#define MATHUTILS_MATRIX_H +#ifndef __MATHUTILS_MATRIX_H__ +#define __MATHUTILS_MATRIX_H__ extern PyTypeObject matrix_Type; extern PyTypeObject matrix_access_Type; @@ -83,4 +83,4 @@ extern struct Mathutils_Callback mathutils_matrix_translation_cb; void matrix_as_3x3(float mat[3][3], MatrixObject *self); -#endif /* MATHUTILS_MATRIX_H */ +#endif /* __MATHUTILS_MATRIX_H__ */ diff --git a/source/blender/python/mathutils/mathutils_Quaternion.h b/source/blender/python/mathutils/mathutils_Quaternion.h index edd5ec55312..8e91f26b08f 100644 --- a/source/blender/python/mathutils/mathutils_Quaternion.h +++ b/source/blender/python/mathutils/mathutils_Quaternion.h @@ -32,8 +32,8 @@ */ -#ifndef MATHUTILS_QUAT_H -#define MATHUTILS_QUAT_H +#ifndef __MATHUTILS_QUATERNION_H__ +#define __MATHUTILS_QUATERNION_H__ extern PyTypeObject quaternion_Type; #define QuaternionObject_Check(_v) PyObject_TypeCheck((_v), &quaternion_Type) @@ -51,4 +51,4 @@ blender (stored in blend_data). This is an either/or struct not both*/ PyObject *Quaternion_CreatePyObject( float *quat, int type, PyTypeObject *base_type); PyObject *Quaternion_CreatePyObject_cb(PyObject *cb_user, int cb_type, int cb_subtype); -#endif /* MATHUTILS_QUAT_H */ +#endif /* __MATHUTILS_QUATERNION_H__ */ diff --git a/source/blender/python/mathutils/mathutils_Vector.h b/source/blender/python/mathutils/mathutils_Vector.h index 4e10e795602..88de991ba43 100644 --- a/source/blender/python/mathutils/mathutils_Vector.h +++ b/source/blender/python/mathutils/mathutils_Vector.h @@ -32,8 +32,8 @@ */ -#ifndef MATHUTILS_VECTOR_H -#define MATHUTILS_VECTOR_H +#ifndef __MATHUTILS_VECTOR_H__ +#define __MATHUTILS_VECTOR_H__ extern PyTypeObject vector_Type; #define VectorObject_Check(_v) PyObject_TypeCheck((_v), &vector_Type) @@ -49,4 +49,4 @@ PyObject *Vector_CreatePyObject(float *vec, const int size, const int type, PyTy PyObject *Vector_CreatePyObject_cb(PyObject *user, int size, int callback_type, int subtype); PyObject *Vector_CreatePyObject_alloc(float *vec, const int size, PyTypeObject *base_type); -#endif /* MATHUTILS_VECTOR_H */ +#endif /* __MATHUTILS_VECTOR_H__ */ diff --git a/source/blender/python/mathutils/mathutils_geometry.h b/source/blender/python/mathutils/mathutils_geometry.h index 1b339bdaf00..ac89698c12e 100644 --- a/source/blender/python/mathutils/mathutils_geometry.h +++ b/source/blender/python/mathutils/mathutils_geometry.h @@ -32,11 +32,11 @@ /*Include this file for access to vector, quat, matrix, euler, etc...*/ -#ifndef MATHUTILS_GEOMETRY_H -#define MATHUTILS_GEOMETRY_H +#ifndef __MATHUTILS_GEOMETRY_H__ +#define __MATHUTILS_GEOMETRY_H__ #include "mathutils.h" PyMODINIT_FUNC PyInit_mathutils_geometry(void); -#endif /* MATHUTILS_GEOMETRY_H */ +#endif /* __MATHUTILS_GEOMETRY_H__ */ diff --git a/source/blender/python/mathutils/mathutils_noise.h b/source/blender/python/mathutils/mathutils_noise.h index 6a6527588ef..f4bec88e59a 100644 --- a/source/blender/python/mathutils/mathutils_noise.h +++ b/source/blender/python/mathutils/mathutils_noise.h @@ -24,8 +24,8 @@ * \ingroup mathutils */ -#ifndef MATHUTILS_NOISE_H -#define MATHUTILS_NOISE_H +#ifndef __MATHUTILS_NOISE_H__ +#define __MATHUTILS_NOISE_H__ #include "mathutils.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__ diff --git a/source/blender/quicktime/quicktime_import.h b/source/blender/quicktime/quicktime_import.h index d095b8353ca..e6f3c821b85 100644 --- a/source/blender/quicktime/quicktime_import.h +++ b/source/blender/quicktime/quicktime_import.h @@ -34,8 +34,8 @@ -#ifndef __QUICKTIME_IMP_H__ -#define __QUICKTIME_IMP_H__ +#ifndef __QUICKTIME_IMPORT_H__ +#define __QUICKTIME_IMPORT_H__ #define __AIFF__ @@ -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_IMP_H__ +#endif // __QUICKTIME_IMPORT_H__ diff --git a/source/blender/render/extern/include/RE_engine.h b/source/blender/render/extern/include/RE_engine.h index 02a94e56462..5e4a5e05a56 100644 --- a/source/blender/render/extern/include/RE_engine.h +++ b/source/blender/render/extern/include/RE_engine.h @@ -29,8 +29,8 @@ * \ingroup render */ -#ifndef RE_ENGINE_H -#define RE_ENGINE_H +#ifndef __RE_ENGINE_H__ +#define __RE_ENGINE_H__ #include "DNA_listBase.h" #include "RNA_types.h" @@ -116,5 +116,5 @@ void RE_engines_exit(void); RenderEngineType *RE_engines_find(const char *idname); -#endif /* RE_ENGINE_H */ +#endif /* __RE_ENGINE_H__ */ diff --git a/source/blender/render/extern/include/RE_pipeline.h b/source/blender/render/extern/include/RE_pipeline.h index cc4136fcccc..a670446189e 100644 --- a/source/blender/render/extern/include/RE_pipeline.h +++ b/source/blender/render/extern/include/RE_pipeline.h @@ -29,8 +29,8 @@ * \ingroup render */ -#ifndef RE_PIPELINE_H -#define RE_PIPELINE_H +#ifndef __RE_PIPELINE_H__ +#define __RE_PIPELINE_H__ #include "DNA_listBase.h" #include "DNA_vec_types.h" @@ -272,5 +272,5 @@ struct Scene *RE_GetScene(struct Render *re); int RE_is_rendering_allowed(struct Scene *scene, struct Object *camera_override, struct ReportList *reports); -#endif /* RE_PIPELINE_H */ +#endif /* __RE_PIPELINE_H__ */ diff --git a/source/blender/render/extern/include/RE_render_ext.h b/source/blender/render/extern/include/RE_render_ext.h index f93e3c9fd20..054aaccb177 100644 --- a/source/blender/render/extern/include/RE_render_ext.h +++ b/source/blender/render/extern/include/RE_render_ext.h @@ -29,8 +29,8 @@ */ -#ifndef RE_RENDER_EXT_H -#define RE_RENDER_EXT_H +#ifndef __RE_RENDER_EXT_H__ +#define __RE_RENDER_EXT_H__ /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ /* this include is for non-render pipeline exports (still old cruft here) */ @@ -70,5 +70,5 @@ void RE_free_sample_material(struct Material *mat); void RE_sample_material_color(struct Material *mat, float color[3], float *alpha, const float volume_co[3], const float surface_co[3], int face_index, short hit_quad, struct DerivedMesh *orcoDm, struct Object *ob); -#endif /* RE_RENDER_EXT_H */ +#endif /* __RE_RENDER_EXT_H__ */ diff --git a/source/blender/render/extern/include/RE_shader_ext.h b/source/blender/render/extern/include/RE_shader_ext.h index 2f585f91d44..cf9e6f7966f 100644 --- a/source/blender/render/extern/include/RE_shader_ext.h +++ b/source/blender/render/extern/include/RE_shader_ext.h @@ -29,8 +29,8 @@ */ -#ifndef RE_SHADER_EXT_H -#define RE_SHADER_EXT_H +#ifndef __RE_SHADER_EXT_H__ +#define __RE_SHADER_EXT_H__ /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ /* this include is for shading and texture exports */ @@ -214,4 +214,4 @@ void RE_bake_ibuf_filter(struct ImBuf *ibuf, char *mask, const int filter); #define BAKE_RESULT_NO_OBJECTS 1 #define BAKE_RESULT_FEEDBACK_LOOP 2 -#endif /* RE_SHADER_EXT_H */ +#endif /* __RE_SHADER_EXT_H__ */ diff --git a/source/blender/render/intern/include/envmap.h b/source/blender/render/intern/include/envmap.h index 0133c08a6a7..24138884cd2 100644 --- a/source/blender/render/intern/include/envmap.h +++ b/source/blender/render/intern/include/envmap.h @@ -33,8 +33,8 @@ */ -#ifndef ENVMAP_EXT_H -#define ENVMAP_EXT_H +#ifndef __ENVMAP_H__ +#define __ENVMAP_H__ /** * Make environment maps for all objects in the scene that have an @@ -48,5 +48,5 @@ struct TexResult; void make_envmaps(struct Render *re); int envmaptex(struct Tex *tex, float *texvec, float *dxt, float *dyt, int osatex, struct TexResult *texres); -#endif /* ENVMAP_EXT_H */ +#endif /* __ENVMAP_H__ */ diff --git a/source/blender/render/intern/include/gammaCorrectionTables.h b/source/blender/render/intern/include/gammaCorrectionTables.h index 29ceef82c09..b41fc01eaaf 100644 --- a/source/blender/render/intern/include/gammaCorrectionTables.h +++ b/source/blender/render/intern/include/gammaCorrectionTables.h @@ -33,8 +33,8 @@ */ -#ifndef GAMMACORRECTIONTABLES_H -#define GAMMACORRECTIONTABLES_H +#ifndef __GAMMACORRECTIONTABLES_H__ +#define __GAMMACORRECTIONTABLES_H__ /** * Initialise the gamma lookup tables diff --git a/source/blender/render/intern/include/initrender.h b/source/blender/render/intern/include/initrender.h index 17fa312a6cd..e4fb338771e 100644 --- a/source/blender/render/intern/include/initrender.h +++ b/source/blender/render/intern/include/initrender.h @@ -33,8 +33,8 @@ */ -#ifndef INITRENDER_H -#define INITRENDER_H +#ifndef __INITRENDER_H__ +#define __INITRENDER_H__ struct Object; @@ -49,5 +49,5 @@ void initparts(Render *re); void freeparts(Render *re); -#endif /* INITRENDER_H */ +#endif /* __INITRENDER_H__ */ diff --git a/source/blender/render/intern/include/occlusion.h b/source/blender/render/intern/include/occlusion.h index 15581c8d7d4..78a1f8a1175 100644 --- a/source/blender/render/intern/include/occlusion.h +++ b/source/blender/render/intern/include/occlusion.h @@ -31,8 +31,8 @@ */ -#ifndef OCCLUSION_H -#define OCCLUSION_H +#ifndef __OCCLUSION_H__ +#define __OCCLUSION_H__ struct Render; struct ShadeInput; diff --git a/source/blender/render/intern/include/pixelblending.h b/source/blender/render/intern/include/pixelblending.h index 87a5ed07747..aa2698716e9 100644 --- a/source/blender/render/intern/include/pixelblending.h +++ b/source/blender/render/intern/include/pixelblending.h @@ -28,8 +28,8 @@ */ -#ifndef PIXELBLENDING_EXT_H -#define PIXELBLENDING_EXT_H +#ifndef __PIXELBLENDING_H__ +#define __PIXELBLENDING_H__ /** @@ -69,5 +69,5 @@ void addalphaUnderGammaFloat(float *doel, float *bron); -#endif /* PIXELBLENDING_EXT_H */ +#endif /* __PIXELBLENDING_H__ */ diff --git a/source/blender/render/intern/include/pixelshading.h b/source/blender/render/intern/include/pixelshading.h index 6f4b373f8d4..17032283540 100644 --- a/source/blender/render/intern/include/pixelshading.h +++ b/source/blender/render/intern/include/pixelshading.h @@ -34,8 +34,8 @@ */ -#ifndef PIXELSHADING_H -#define PIXELSHADING_H +#ifndef __PIXELSHADING_H__ +#define __PIXELSHADING_H__ /** * Render the pixel at (x,y) for object ap. Apply the jitter mask. diff --git a/source/blender/render/intern/include/pointdensity.h b/source/blender/render/intern/include/pointdensity.h index 7ceb24e9ece..cc8fabda49c 100644 --- a/source/blender/render/intern/include/pointdensity.h +++ b/source/blender/render/intern/include/pointdensity.h @@ -30,8 +30,8 @@ */ -#ifndef POINTDENSITY_H -#define POINTDENSITY_H +#ifndef __POINTDENSITY_H__ +#define __POINTDENSITY_H__ /** * Make point density kd-trees for all point density textures in the scene @@ -45,5 +45,5 @@ void make_pointdensities(struct Render *re); void free_pointdensities(struct Render *re); int pointdensitytex(struct Tex *tex, float *texvec, struct TexResult *texres); -#endif /* POINTDENSITY_H */ +#endif /* __POINTDENSITY_H__ */ diff --git a/source/blender/render/intern/include/raycounter.h b/source/blender/render/intern/include/raycounter.h index 20348f8d418..075a6337435 100644 --- a/source/blender/render/intern/include/raycounter.h +++ b/source/blender/render/intern/include/raycounter.h @@ -30,8 +30,8 @@ */ -#ifndef RE_RAYCOUNTER_H -#define RE_RAYCOUNTER_H +#ifndef __RAYCOUNTER_H__ +#define __RAYCOUNTER_H__ //#define RE_RAYCOUNTER /* enable counters per ray, useful for measuring raytrace structures performance */ diff --git a/source/blender/render/intern/include/rayintersection.h b/source/blender/render/intern/include/rayintersection.h index 2c68421a8ee..934bf92db8f 100644 --- a/source/blender/render/intern/include/rayintersection.h +++ b/source/blender/render/intern/include/rayintersection.h @@ -31,8 +31,8 @@ */ -#ifndef __RENDER_RAYINTERSECTION_H__ -#define __RENDER_RAYINTERSECTION_H__ +#ifndef __RAYINTERSECTION_H__ +#define __RAYINTERSECTION_H__ #ifdef __cplusplus extern "C" { @@ -123,5 +123,5 @@ typedef struct Isect { } #endif -#endif /* __RENDER_RAYINTERSECTION_H__ */ +#endif /* __RAYINTERSECTION_H__ */ diff --git a/source/blender/render/intern/include/rayobject.h b/source/blender/render/intern/include/rayobject.h index 3ca3bd63428..c93c4e1da63 100644 --- a/source/blender/render/intern/include/rayobject.h +++ b/source/blender/render/intern/include/rayobject.h @@ -30,8 +30,8 @@ */ -#ifndef RE_RAYOBJECT_H -#define RE_RAYOBJECT_H +#ifndef __RAYOBJECT_H__ +#define __RAYOBJECT_H__ #ifdef __cplusplus extern "C" { diff --git a/source/blender/render/intern/include/render_result.h b/source/blender/render/intern/include/render_result.h index 93cbc6fe9c9..3d73ee1e912 100644 --- a/source/blender/render/intern/include/render_result.h +++ b/source/blender/render/intern/include/render_result.h @@ -29,8 +29,8 @@ * \ingroup render */ -#ifndef RENDER_RESULT_H -#define RENDER_RESULT_H +#ifndef __RENDER_RESULT_H__ +#define __RENDER_RESULT_H__ #define PASS_VECTOR_MAX 10000.0f @@ -90,5 +90,5 @@ void render_result_rect_fill_zero(struct RenderResult *rr); void render_result_rect_get_pixels(struct RenderResult *rr, struct RenderData *rd, unsigned int *rect, int rectx, int recty); -#endif /* RENDER_RESULT_H */ +#endif /* __RENDER_RESULT_H__ */ diff --git a/source/blender/render/intern/include/render_types.h b/source/blender/render/intern/include/render_types.h index f414be60b0a..886a6ce74f2 100644 --- a/source/blender/render/intern/include/render_types.h +++ b/source/blender/render/intern/include/render_types.h @@ -28,8 +28,8 @@ */ -#ifndef RENDER_TYPES_H -#define RENDER_TYPES_H +#ifndef __RENDER_TYPES_H__ +#define __RENDER_TYPES_H__ /* ------------------------------------------------------------------------- */ /* exposed internal in render module only! */ @@ -628,5 +628,5 @@ typedef struct LampRen { #define R_ENV_TRANSFORMED 2 #define R_TRANSFORMED (1|2) -#endif /* RENDER_TYPES_H */ +#endif /* __RENDER_TYPES_H__ */ diff --git a/source/blender/render/intern/include/rendercore.h b/source/blender/render/intern/include/rendercore.h index 08f73ccbe0d..496e2bb50a9 100644 --- a/source/blender/render/intern/include/rendercore.h +++ b/source/blender/render/intern/include/rendercore.h @@ -33,8 +33,8 @@ */ -#ifndef RENDERCORE_H -#define RENDERCORE_H +#ifndef __RENDERCORE_H__ +#define __RENDERCORE_H__ #include "render_types.h" diff --git a/source/blender/render/intern/include/renderdatabase.h b/source/blender/render/intern/include/renderdatabase.h index ebbbfb03f55..d11732f7da1 100644 --- a/source/blender/render/intern/include/renderdatabase.h +++ b/source/blender/render/intern/include/renderdatabase.h @@ -30,8 +30,8 @@ */ -#ifndef RENDERDATABASE_H -#define RENDERDATABASE_H +#ifndef __RENDERDATABASE_H__ +#define __RENDERDATABASE_H__ struct Object; struct VlakRen; @@ -144,5 +144,5 @@ void init_render_world(Render *re); void RE_Database_FromScene_Vectors(Render *re, struct Main *bmain, struct Scene *sce, unsigned int lay); -#endif /* RENDERDATABASE_H */ +#endif /* __RENDERDATABASE_H__ */ diff --git a/source/blender/render/intern/include/renderpipeline.h b/source/blender/render/intern/include/renderpipeline.h index 9a87cf84012..e713d4880d6 100644 --- a/source/blender/render/intern/include/renderpipeline.h +++ b/source/blender/render/intern/include/renderpipeline.h @@ -30,8 +30,8 @@ */ -#ifndef PIPELINE_H -#define PIPELINE_H +#ifndef __RENDERPIPELINE_H__ +#define __RENDERPIPELINE_H__ struct Render; struct RenderLayer; @@ -40,5 +40,5 @@ struct RenderResult; struct RenderLayer *render_get_active_layer(struct Render *re, struct RenderResult *rr); float panorama_pixel_rot(struct Render *re); -#endif /* PIPELINE_H */ +#endif /* __RENDERPIPELINE_H__ */ diff --git a/source/blender/render/intern/include/shadbuf.h b/source/blender/render/intern/include/shadbuf.h index a37af5abb4a..ddcfc555f7a 100644 --- a/source/blender/render/intern/include/shadbuf.h +++ b/source/blender/render/intern/include/shadbuf.h @@ -33,8 +33,8 @@ */ -#ifndef SHADBUF_EXT_H -#define SHADBUF_EXT_H +#ifndef __SHADBUF_H__ +#define __SHADBUF_H__ #include "render_types.h" @@ -114,5 +114,5 @@ typedef struct ISBData { int minx, miny, rectx, recty; /* copy from part disprect */ } ISBData; -#endif /* SHADBUF_EXT_H */ +#endif /* __SHADBUF_H__ */ diff --git a/source/blender/render/intern/include/sss.h b/source/blender/render/intern/include/sss.h index 4e110da25dd..6a179d2f428 100644 --- a/source/blender/render/intern/include/sss.h +++ b/source/blender/render/intern/include/sss.h @@ -30,8 +30,8 @@ */ -#ifndef SSS_H -#define SSS_H +#ifndef __SSS_H__ +#define __SSS_H__ /* Generic multiple scattering API */ @@ -64,5 +64,5 @@ void free_sss(struct Render *re); int sample_sss(struct Render *re, struct Material *mat, float *co, float *col); int sss_pass_done(struct Render *re, struct Material *mat); -#endif /*SSS_H*/ +#endif /*__SSS_H__*/ diff --git a/source/blender/render/intern/include/strand.h b/source/blender/render/intern/include/strand.h index 1cf34c7ad50..4403f68c982 100644 --- a/source/blender/render/intern/include/strand.h +++ b/source/blender/render/intern/include/strand.h @@ -30,8 +30,8 @@ */ -#ifndef STRAND_H -#define STRAND_H +#ifndef __STRAND_H__ +#define __STRAND_H__ struct StrandVert; struct StrandRen; diff --git a/source/blender/render/intern/include/sunsky.h b/source/blender/render/intern/include/sunsky.h index 8c0cbfd18e7..5076a1541af 100644 --- a/source/blender/render/intern/include/sunsky.h +++ b/source/blender/render/intern/include/sunsky.h @@ -29,8 +29,8 @@ * and example code from Brian Smits, another author of that paper in * http://www.cs.utah.edu/vissim/papers/sunsky/code/ * */ -#ifndef SUNSKY_H_ -#define SUNSKY_H_ +#ifndef __SUNSKY_H__ +#define __SUNSKY_H__ #define SPECTRUM_MAX_COMPONENTS 100 #define SPECTRUM_START 350.0 @@ -146,4 +146,4 @@ void AtmospherePixleShader( struct SunSky* sunSky, float view[3], float s, float * */ void ClipColor(float c[3]); -#endif /*SUNSKY_H_*/ +#endif /*__SUNSKY_H__*/ diff --git a/source/blender/render/intern/include/texture.h b/source/blender/render/intern/include/texture.h index a8d13077680..e5013ace1f0 100644 --- a/source/blender/render/intern/include/texture.h +++ b/source/blender/render/intern/include/texture.h @@ -33,8 +33,8 @@ */ -#ifndef TEXTURE_EXT_H -#define TEXTURE_EXT_H +#ifndef __TEXTURE_H__ +#define __TEXTURE_H__ #define BRICONT \ texres->tin= (texres->tin-0.5f) * tex->contrast+tex->bright-0.5f; \ @@ -85,5 +85,5 @@ int imagewraposa(struct Tex *tex, struct Image *ima, struct ImBuf *ibuf, const f int imagewrap(struct Tex *tex, struct Image *ima, struct ImBuf *ibuf, const float texvec[3], struct TexResult *texres); void image_sample(struct Image *ima, float fx, float fy, float dx, float dy, float *result); -#endif /* TEXTURE_EXT_H */ +#endif /* __TEXTURE_H__ */ diff --git a/source/blender/render/intern/include/voxeldata.h b/source/blender/render/intern/include/voxeldata.h index aa4a9fdb845..3d6280c5c28 100644 --- a/source/blender/render/intern/include/voxeldata.h +++ b/source/blender/render/intern/include/voxeldata.h @@ -30,8 +30,8 @@ */ -#ifndef VOXELDATA_H -#define VOXELDATA_H +#ifndef __VOXELDATA_H__ +#define __VOXELDATA_H__ struct Render; struct TexResult; @@ -47,4 +47,4 @@ void make_voxeldata(struct Render *re); void free_voxeldata(struct Render *re); int voxeldatatex(struct Tex *tex, const float texvec[3], struct TexResult *texres); -#endif /* VOXELDATA_H */ +#endif /* __VOXELDATA_H__ */ diff --git a/source/blender/render/intern/include/zbuf.h b/source/blender/render/intern/include/zbuf.h index c467c31b5a6..518b2f846d3 100644 --- a/source/blender/render/intern/include/zbuf.h +++ b/source/blender/render/intern/include/zbuf.h @@ -30,8 +30,8 @@ */ -#ifndef ZBUF_H -#define ZBUF_H +#ifndef __ZBUF_H__ +#define __ZBUF_H__ struct RenderPart; struct RenderLayer; diff --git a/source/blender/render/intern/raytrace/bvh.h b/source/blender/render/intern/raytrace/bvh.h index cdc905fbf04..b2ec1552f04 100644 --- a/source/blender/render/intern/raytrace/bvh.h +++ b/source/blender/render/intern/raytrace/bvh.h @@ -46,8 +46,8 @@ #include <xmmintrin.h> #endif -#ifndef RE_RAYTRACE_BVH_H -#define RE_RAYTRACE_BVH_H +#ifndef __BVH_H__ +#define __BVH_H__ #ifdef __SSE__ inline int test_bb_group4(__m128 *bb_group, const Isect *isec) diff --git a/source/blender/render/intern/raytrace/rayobject_hint.h b/source/blender/render/intern/raytrace/rayobject_hint.h index e13a8e68b27..9e505b68101 100644 --- a/source/blender/render/intern/raytrace/rayobject_hint.h +++ b/source/blender/render/intern/raytrace/rayobject_hint.h @@ -30,8 +30,8 @@ */ -#ifndef RE_RAYTRACE_RAYOBJECT_HINT_H -#define RE_RAYTRACE_RAYOBJECT_HINT_H +#ifndef __RAYOBJECT_HINT_H__ +#define __RAYOBJECT_HINT_H__ #define HINT_RECURSE 1 #define HINT_ACCEPT 0 diff --git a/source/blender/render/intern/raytrace/rayobject_internal.h b/source/blender/render/intern/raytrace/rayobject_internal.h index 458c892d410..8e39b687b34 100644 --- a/source/blender/render/intern/raytrace/rayobject_internal.h +++ b/source/blender/render/intern/raytrace/rayobject_internal.h @@ -2,8 +2,8 @@ * \ingroup render */ -#ifndef RE_RAYOBJECT_INTERNAL_H -#define RE_RAYOBJECT_INTERNAL_H +#ifndef __RAYOBJECT_INTERNAL_H__ +#define __RAYOBJECT_INTERNAL_H__ #ifdef __cplusplus extern "C" { diff --git a/source/blender/render/intern/raytrace/rayobject_rtbuild.h b/source/blender/render/intern/raytrace/rayobject_rtbuild.h index c4088981d92..f6e9aabf43d 100644 --- a/source/blender/render/intern/raytrace/rayobject_rtbuild.h +++ b/source/blender/render/intern/raytrace/rayobject_rtbuild.h @@ -29,8 +29,8 @@ * \ingroup render */ -#ifndef RE_RAYOBJECT_RTBUILD_H -#define RE_RAYOBJECT_RTBUILD_H +#ifndef __RAYOBJECT_RTBUILD_H__ +#define __RAYOBJECT_RTBUILD_H__ #ifdef __cplusplus extern "C" { diff --git a/source/blender/render/intern/raytrace/svbvh.h b/source/blender/render/intern/raytrace/svbvh.h index 2f49531ff34..8fb2db63df6 100644 --- a/source/blender/render/intern/raytrace/svbvh.h +++ b/source/blender/render/intern/raytrace/svbvh.h @@ -32,8 +32,8 @@ #ifdef __SSE__ -#ifndef RE_RAYTRACE_SVBVH_H -#define RE_RAYTRACE_SVBVH_H +#ifndef __SVBVH_H__ +#define __SVBVH_H__ #include "bvh.h" #include "BLI_memarena.h" diff --git a/source/blender/windowmanager/WM_api.h b/source/blender/windowmanager/WM_api.h index 132b57696e1..1be94d9c634 100644 --- a/source/blender/windowmanager/WM_api.h +++ b/source/blender/windowmanager/WM_api.h @@ -23,8 +23,8 @@ * * ***** END GPL LICENSE BLOCK ***** */ -#ifndef WM_API_H -#define WM_API_H +#ifndef __WM_API_H__ +#define __WM_API_H__ /** \file WM_api.h * \ingroup wm @@ -344,5 +344,5 @@ int write_crash_blend(void); } #endif -#endif /* WM_API_H */ +#endif /* __WM_API_H__ */ diff --git a/source/blender/windowmanager/WM_keymap.h b/source/blender/windowmanager/WM_keymap.h index f254358e3cf..db448397065 100644 --- a/source/blender/windowmanager/WM_keymap.h +++ b/source/blender/windowmanager/WM_keymap.h @@ -23,8 +23,8 @@ * ***** END GPL LICENSE BLOCK ***** */ -#ifndef WM_KEYMAP_H -#define WM_KEYMAP_H +#ifndef __WM_KEYMAP_H__ +#define __WM_KEYMAP_H__ /** \file WM_keymap.h * \ingroup wm @@ -98,5 +98,5 @@ char *WM_key_event_operator_string(const struct bContext *C, const char *opname } #endif -#endif /* WM_KEYMAP_H */ +#endif /* __WM_KEYMAP_H__ */ diff --git a/source/blender/windowmanager/WM_types.h b/source/blender/windowmanager/WM_types.h index 357eaf2633b..3a62faeab8a 100644 --- a/source/blender/windowmanager/WM_types.h +++ b/source/blender/windowmanager/WM_types.h @@ -28,8 +28,8 @@ * \ingroup wm */ -#ifndef WM_TYPES_H -#define WM_TYPES_H +#ifndef __WM_TYPES_H__ +#define __WM_TYPES_H__ #ifdef __cplusplus extern "C" { @@ -569,5 +569,5 @@ typedef struct RecentFile { } #endif -#endif /* WM_TYPES_H */ +#endif /* __WM_TYPES_H__ */ diff --git a/source/blender/windowmanager/wm.h b/source/blender/windowmanager/wm.h index d9dcb9ea10c..d1081f5450c 100644 --- a/source/blender/windowmanager/wm.h +++ b/source/blender/windowmanager/wm.h @@ -28,8 +28,8 @@ * \ingroup wm */ -#ifndef WM_H -#define WM_H +#ifndef __WM_H__ +#define __WM_H__ struct wmWindow; struct ReportList; @@ -85,5 +85,5 @@ void wm_autosave_location(char *filepath); extern int circle_select_size; #endif -#endif /* WM_H */ +#endif /* __WM_H__ */ diff --git a/source/blender/windowmanager/wm_cursors.h b/source/blender/windowmanager/wm_cursors.h index c179483eff3..f41b15aadcf 100644 --- a/source/blender/windowmanager/wm_cursors.h +++ b/source/blender/windowmanager/wm_cursors.h @@ -32,8 +32,8 @@ -#ifndef WM_CURSORS_H -#define WM_CURSORS_H +#ifndef __WM_CURSORS_H__ +#define __WM_CURSORS_H__ void wm_init_cursor_data(void); @@ -120,5 +120,5 @@ struct wmEvent; int wm_cursor_arrow_move(struct wmWindow *win, struct wmEvent *event); -#endif /* WM_CURSORS_H */ +#endif /* __WM_CURSORS_H__ */ diff --git a/source/blender/windowmanager/wm_draw.h b/source/blender/windowmanager/wm_draw.h index 9e22fc8c412..3d72fe17c79 100644 --- a/source/blender/windowmanager/wm_draw.h +++ b/source/blender/windowmanager/wm_draw.h @@ -29,8 +29,8 @@ */ -#ifndef WM_DRAW_H -#define WM_DRAW_H +#ifndef __WM_DRAW_H__ +#define __WM_DRAW_H__ struct bContext; struct wmWindow; @@ -43,5 +43,5 @@ void wm_draw_region_clear (struct wmWindow *win, struct ARegion *ar); void wm_tag_redraw_overlay (struct wmWindow *win, struct ARegion *ar); -#endif /* WM_DRAW_H */ +#endif /* __WM_DRAW_H__ */ diff --git a/source/blender/windowmanager/wm_event_system.h b/source/blender/windowmanager/wm_event_system.h index 9c0d2ae3eff..a33d37ac50e 100644 --- a/source/blender/windowmanager/wm_event_system.h +++ b/source/blender/windowmanager/wm_event_system.h @@ -28,8 +28,8 @@ * \ingroup wm */ -#ifndef WM_EVENT_SYSTEM_H -#define WM_EVENT_SYSTEM_H +#ifndef __WM_EVENT_SYSTEM_H__ +#define __WM_EVENT_SYSTEM_H__ /* return value of handler-operator call */ #define WM_HANDLER_CONTINUE 0 @@ -107,5 +107,5 @@ void wm_dropbox_free(void); void wm_drags_check_ops(bContext *C, wmEvent *event); void wm_drags_draw(bContext *C, wmWindow *win, rcti *rect); -#endif /* WM_EVENT_SYSTEM_H */ +#endif /* __WM_EVENT_SYSTEM_H__ */ diff --git a/source/blender/windowmanager/wm_event_types.h b/source/blender/windowmanager/wm_event_types.h index 47081b6a6a1..170413c13b0 100644 --- a/source/blender/windowmanager/wm_event_types.h +++ b/source/blender/windowmanager/wm_event_types.h @@ -35,8 +35,8 @@ */ -#ifndef WM_EVENT_TYPES_H -#define WM_EVENT_TYPES_H +#ifndef __WM_EVENT_TYPES_H__ +#define __WM_EVENT_TYPES_H__ /* customdata type */ #define EVT_DATA_TABLET 1 @@ -365,5 +365,5 @@ enum { #define GESTURE_MODAL_OUT 10 -#endif /* WM_EVENT_TYPES_H */ +#endif /* __WM_EVENT_TYPES_H__ */ diff --git a/source/blender/windowmanager/wm_files.h b/source/blender/windowmanager/wm_files.h index 64f05e7c581..f373530b5e6 100644 --- a/source/blender/windowmanager/wm_files.h +++ b/source/blender/windowmanager/wm_files.h @@ -28,10 +28,10 @@ * \ingroup wm */ -#ifndef WM_FILES_H -#define WM_FILES_H +#ifndef __WM_FILES_H__ +#define __WM_FILES_H__ void WM_read_history(void); -#endif /* WM_FILES_H */ +#endif /* __WM_FILES_H__ */ diff --git a/source/blender/windowmanager/wm_subwindow.h b/source/blender/windowmanager/wm_subwindow.h index 6fecefe5479..5017977952b 100644 --- a/source/blender/windowmanager/wm_subwindow.h +++ b/source/blender/windowmanager/wm_subwindow.h @@ -29,8 +29,8 @@ */ -#ifndef WM_SUBWINDOW_H -#define WM_SUBWINDOW_H +#ifndef __WM_SUBWINDOW_H__ +#define __WM_SUBWINDOW_H__ /* *************** internal api ************** */ @@ -50,5 +50,5 @@ void wm_subwindow_getmatrix(wmWindow *win, int swinid, float mat[][4]); unsigned int index_to_framebuffer(int index); -#endif /* WM_SUBWINDOW_H */ +#endif /* __WM_SUBWINDOW_H__ */ diff --git a/source/blender/windowmanager/wm_window.h b/source/blender/windowmanager/wm_window.h index ec6d815cfc2..27eb4542877 100644 --- a/source/blender/windowmanager/wm_window.h +++ b/source/blender/windowmanager/wm_window.h @@ -29,8 +29,8 @@ */ -#ifndef WM_WINDOW_H -#define WM_WINDOW_H +#ifndef __WM_WINDOW_H__ +#define __WM_WINDOW_H__ struct bScreen; struct wmOperator; @@ -70,5 +70,5 @@ void wm_window_testbreak (void); int wm_window_duplicate_exec(bContext *C, struct wmOperator *op); int wm_window_fullscreen_toggle_exec(bContext *C, struct wmOperator *op); -#endif /* WM_WINDOW_H */ +#endif /* __WM_WINDOW_H__ */ |