[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60243] trunk/blender/source: correct include guards and add checks in check_style_c.py for them.
Campbell Barton
ideasman42 at gmail.com
Fri Sep 20 01:17:52 CEST 2013
Revision: 60243
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60243
Author: campbellbarton
Date: 2013-09-19 23:17:52 +0000 (Thu, 19 Sep 2013)
Log Message:
-----------
correct include guards and add checks in check_style_c.py for them.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/CCGSubSurf.h
trunk/blender/source/blender/blenlib/BLI_alloca.h
trunk/blender/source/blender/blenlib/BLI_convexhull2d.h
trunk/blender/source/blender/blenlib/BLI_math_interp.h
trunk/blender/source/blender/bmesh/tools/bmesh_triangulate.h
trunk/blender/source/blender/compositor/COM_compositor.h
trunk/blender/source/blender/compositor/COM_defines.h
trunk/blender/source/blender/editors/include/ED_lattice.h
trunk/blender/source/blender/editors/space_info/textview.h
trunk/blender/source/blender/modifiers/intern/MOD_meshcache_util.h
trunk/blender/source/blender/nodes/NOD_common.h
trunk/blender/source/blender/python/bmesh/bmesh_py_types.h
trunk/blender/source/blender/python/generic/blf_py_api.h
trunk/blender/source/blender/python/intern/bpy.h
trunk/blender/source/blender/python/intern/bpy_intern_string.h
trunk/blender/source/blender/python/intern/bpy_rna_anim.h
trunk/blender/source/blender/python/intern/bpy_rna_callback.h
trunk/blender/source/blender/python/intern/gpu.h
trunk/blender/source/tools/check_style_c.py
Modified: trunk/blender/source/blender/blenkernel/intern/CCGSubSurf.h
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/CCGSubSurf.h 2013-09-19 21:59:22 UTC (rev 60242)
+++ trunk/blender/source/blender/blenkernel/intern/CCGSubSurf.h 2013-09-19 23:17:52 UTC (rev 60243)
@@ -18,6 +18,9 @@
* ***** END GPL LICENSE BLOCK *****
*/
+#ifndef __CCGSUBSURF_H__
+#define __CCGSUBSURF_H__
+
/** \file blender/blenkernel/intern/CCGSubSurf.h
* \ingroup bke
*/
@@ -182,3 +185,5 @@
int ccgFaceIterator_isStopped (CCGFaceIterator *fi);
void ccgFaceIterator_next (CCGFaceIterator *fi);
void ccgFaceIterator_free (CCGFaceIterator *fi);
+
+#endif /* __CCGSUBSURF_H__ */
Modified: trunk/blender/source/blender/blenlib/BLI_alloca.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_alloca.h 2013-09-19 21:59:22 UTC (rev 60242)
+++ trunk/blender/source/blender/blenlib/BLI_alloca.h 2013-09-19 23:17:52 UTC (rev 60243)
@@ -19,6 +19,7 @@
*/
#ifndef __BLI_ALLOCA_H__
+#define __BLI_ALLOCA_H__
/** \file BLI_alloca.h
* \ingroup bli
Modified: trunk/blender/source/blender/blenlib/BLI_convexhull2d.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_convexhull2d.h 2013-09-19 21:59:22 UTC (rev 60242)
+++ trunk/blender/source/blender/blenlib/BLI_convexhull2d.h 2013-09-19 23:17:52 UTC (rev 60243)
@@ -18,8 +18,8 @@
* ***** END GPL LICENSE BLOCK *****
*/
-#ifndef __BLI_CONVEXHULL2D__
-#define __BLI_CONVEXHULL2D__
+#ifndef __BLI_CONVEXHULL2D_H__
+#define __BLI_CONVEXHULL2D_H__
/** \file BLI_convexhull2d.h
* \ingroup bli
@@ -31,4 +31,4 @@
float BLI_convexhull_aabb_fit_hull_2d(const float (*points_hull)[2], unsigned int n);
float BLI_convexhull_aabb_fit_points_2d(const float (*points)[2], unsigned int n);
-#endif /* __BLI_CONVEXHULL2D__ */
+#endif /* __BLI_CONVEXHULL2D_H__ */
Modified: trunk/blender/source/blender/blenlib/BLI_math_interp.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_math_interp.h 2013-09-19 21:59:22 UTC (rev 60242)
+++ trunk/blender/source/blender/blenlib/BLI_math_interp.h 2013-09-19 23:17:52 UTC (rev 60243)
@@ -26,8 +26,8 @@
*
*/
-#ifndef __BLI_MATH_INTERP__
-#define __BLI_MATH_INTERP__
+#ifndef __BLI_MATH_INTERP_H__
+#define __BLI_MATH_INTERP_H__
/** \file BLI_math_interp.h
* \ingroup bli
@@ -45,4 +45,4 @@
void BLI_bilinear_interpolation_char(const unsigned char *buffer, unsigned char *output, int width, int height,
int components, float u, float v);
-#endif /* __BLI_MATH_INTERP__ */
+#endif /* __BLI_MATH_INTERP_H__ */
Modified: trunk/blender/source/blender/bmesh/tools/bmesh_triangulate.h
===================================================================
--- trunk/blender/source/blender/bmesh/tools/bmesh_triangulate.h 2013-09-19 21:59:22 UTC (rev 60242)
+++ trunk/blender/source/blender/bmesh/tools/bmesh_triangulate.h 2013-09-19 23:17:52 UTC (rev 60243)
@@ -27,10 +27,10 @@
*
*/
-#ifndef __BMESH_TRIAMGULATE_H__
-#define __BMESH_TRIAMGULATE_H__
+#ifndef __BMESH_TRIANGULATE_H__
+#define __BMESH_TRIANGULATE_H__
void BM_mesh_triangulate(BMesh *bm, const bool use_beauty, const bool tag_only,
BMOperator *op, BMOpSlot *slot_facemap_out);
-#endif /* __BMESH_TRIAMGULATE_H__ */
+#endif /* __BMESH_TRIANGULATE_H__ */
Modified: trunk/blender/source/blender/compositor/COM_compositor.h
===================================================================
--- trunk/blender/source/blender/compositor/COM_compositor.h 2013-09-19 21:59:22 UTC (rev 60242)
+++ trunk/blender/source/blender/compositor/COM_compositor.h 2013-09-19 23:17:52 UTC (rev 60243)
@@ -20,6 +20,9 @@
* Monique Dewanchand
*/
+#ifndef __COM_COMPOSITOR_H__
+#define __COM_COMPOSITOR_H__
+
#ifdef __cplusplus
extern "C" {
#endif
@@ -343,3 +346,5 @@
#ifdef __cplusplus
}
#endif
+
+#endif /* __COM_COMPOSITOR_H__ */
Modified: trunk/blender/source/blender/compositor/COM_defines.h
===================================================================
--- trunk/blender/source/blender/compositor/COM_defines.h 2013-09-19 21:59:22 UTC (rev 60242)
+++ trunk/blender/source/blender/compositor/COM_defines.h 2013-09-19 23:17:52 UTC (rev 60243)
@@ -20,8 +20,8 @@
* Monique Dewanchand
*/
-#ifndef _COM_defines_h_
-#define _COM_defines_h_
+#ifndef __COM_DEFINES_H__
+#define __COM_DEFINES_H__
/**
* @brief possible data types for SocketConnection
@@ -109,4 +109,4 @@
#define COM_BLUR_BOKEH_PIXELS 512
-#endif
+#endif /* __COM_DEFINES_H__ */
Modified: trunk/blender/source/blender/editors/include/ED_lattice.h
===================================================================
--- trunk/blender/source/blender/editors/include/ED_lattice.h 2013-09-19 21:59:22 UTC (rev 60242)
+++ trunk/blender/source/blender/editors/include/ED_lattice.h 2013-09-19 23:17:52 UTC (rev 60243)
@@ -28,8 +28,13 @@
* \ingroup editors
*/
+#ifndef __ED_LATTICE_H__
+#define __ED_LATTICE_H__
+
struct Object;
void free_editLatt(struct Object *ob);
void make_editLatt(struct Object *obedit);
void load_editLatt(struct Object *obedit);
+
+#endif /* __ED_LATTICE_H__ */
Modified: trunk/blender/source/blender/editors/space_info/textview.h
===================================================================
--- trunk/blender/source/blender/editors/space_info/textview.h 2013-09-19 21:59:22 UTC (rev 60242)
+++ trunk/blender/source/blender/editors/space_info/textview.h 2013-09-19 23:17:52 UTC (rev 60243)
@@ -24,6 +24,8 @@
* \ingroup spinfo
*/
+#ifndef __TEXTVIEW_H__
+#define __TEXTVIEW_H__
typedef struct TextViewContext {
int lheight;
@@ -59,3 +61,5 @@
#define TVC_LINE_FG (1<<0)
#define TVC_LINE_BG (1<<1)
+
+#endif /* __TEXTVIEW_H__ */
Modified: trunk/blender/source/blender/modifiers/intern/MOD_meshcache_util.h
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_meshcache_util.h 2013-09-19 21:59:22 UTC (rev 60242)
+++ trunk/blender/source/blender/modifiers/intern/MOD_meshcache_util.h 2013-09-19 23:17:52 UTC (rev 60243)
@@ -25,6 +25,7 @@
*/
#ifndef __MOD_MESHCACHE_UTIL_H__
+#define __MOD_MESHCACHE_UTIL_H__
struct MPoly;
struct MLoop;
@@ -64,4 +65,4 @@
#define FRAME_SNAP_EPS 0.0001f
-#endif /* __MOD_MESHCACHE_UTIL_H__ */
+#endif /* __MOD_MESHCACHE_UTIL_H__ */
Modified: trunk/blender/source/blender/nodes/NOD_common.h
===================================================================
--- trunk/blender/source/blender/nodes/NOD_common.h 2013-09-19 21:59:22 UTC (rev 60242)
+++ trunk/blender/source/blender/nodes/NOD_common.h 2013-09-19 23:17:52 UTC (rev 60243)
@@ -29,8 +29,8 @@
* \ingroup nodes
*/
-#ifndef NOD_COMMON_H
-#define NOD_COMMON_H
+#ifndef __NOD_COMMON_H__
+#define __NOD_COMMON_H__
#include "BKE_node.h"
@@ -51,4 +51,4 @@
void node_group_input_verify(struct bNodeTree *ntree, struct bNode *node, struct ID *id);
void node_group_output_verify(struct bNodeTree *ntree, struct bNode *node, struct ID *id);
-#endif
+#endif /* __NOD_COMMON_H__ */
Modified: trunk/blender/source/blender/python/bmesh/bmesh_py_types.h
===================================================================
--- trunk/blender/source/blender/python/bmesh/bmesh_py_types.h 2013-09-19 21:59:22 UTC (rev 60242)
+++ trunk/blender/source/blender/python/bmesh/bmesh_py_types.h 2013-09-19 23:17:52 UTC (rev 60243)
@@ -27,8 +27,8 @@
* \ingroup pybmesh
*/
-#ifndef __BMESH_TYPES_H__
-#define __BMESH_TYPES_H__
+#ifndef __BMESH_PY_TYPES_H__
+#define __BMESH_PY_TYPES_H__
extern PyTypeObject BPy_BMesh_Type;
extern PyTypeObject BPy_BMVert_Type;
@@ -205,4 +205,4 @@
extern struct PyC_FlagSet bpy_bm_hflag_all_flags[];
#endif
-#endif /* __BMESH_TYPES_H__ */
+#endif /* __BMESH_PY_TYPES_H__ */
Modified: trunk/blender/source/blender/python/generic/blf_py_api.h
===================================================================
--- trunk/blender/source/blender/python/generic/blf_py_api.h 2013-09-19 21:59:22 UTC (rev 60242)
+++ trunk/blender/source/blender/python/generic/blf_py_api.h 2013-09-19 23:17:52 UTC (rev 60243)
@@ -20,9 +20,13 @@
* ***** END GPL LICENSE BLOCK *****
*/
+#ifndef __BLF_PY_API_H__
+#define __BLF_PY_API_H__
+
/** \file blender/python/generic/blf_py_api.h
* \ingroup pygen
*/
+PyObject *BPyInit_blf(void);
-PyObject *BPyInit_blf(void);
+#endif /* __BLF_PY_API_H__ */
Modified: trunk/blender/source/blender/python/intern/bpy.h
===================================================================
--- trunk/blender/source/blender/python/intern/bpy.h 2013-09-19 21:59:22 UTC (rev 60242)
+++ trunk/blender/source/blender/python/intern/bpy.h 2013-09-19 23:17:52 UTC (rev 60243)
@@ -24,6 +24,7 @@
*/
#ifndef __BPY_H__
+#define __BPY_H__
void BPy_init_modules(void);
extern PyObject *bpy_package_py;
Modified: trunk/blender/source/blender/python/intern/bpy_intern_string.h
===================================================================
--- trunk/blender/source/blender/python/intern/bpy_intern_string.h 2013-09-19 21:59:22 UTC (rev 60242)
+++ trunk/blender/source/blender/python/intern/bpy_intern_string.h 2013-09-19 23:17:52 UTC (rev 60243)
@@ -20,6 +20,9 @@
* ***** END GPL LICENSE BLOCK *****
*/
+#ifndef __BPY_INTERN_STRING_H__
+#define __BPY_INTERN_STRING_H__
+
/** \file blender/python/intern/bpy_intern_string.h
* \ingroup pythonintern
*/
@@ -36,3 +39,5 @@
extern PyObject *bpy_intern_str___slots__;
extern PyObject *bpy_intern_str___name__;
extern PyObject *bpy_intern_str___doc__;
+
+#endif /* __BPY_INTERN_STRING_H__ */
Modified: trunk/blender/source/blender/python/intern/bpy_rna_anim.h
===================================================================
--- trunk/blender/source/blender/python/intern/bpy_rna_anim.h 2013-09-19 21:59:22 UTC (rev 60242)
+++ trunk/blender/source/blender/python/intern/bpy_rna_anim.h 2013-09-19 23:17:52 UTC (rev 60243)
@@ -20,6 +20,9 @@
* ***** END GPL LICENSE BLOCK *****
*/
+#ifndef __BPY_RNA_ANIM_H__
+#define __BPY_RNA_ANIM_H__
+
/** \file blender/python/intern/bpy_rna_anim.h
* \ingroup pythonintern
*/
@@ -33,3 +36,5 @@
PyObject *pyrna_struct_keyframe_delete(BPy_StructRNA *self, PyObject *args, PyObject *kw);
PyObject *pyrna_struct_driver_add(BPy_StructRNA *self, PyObject *args);
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list