[Bf-blender-cvs] [38d35603f22] master: Correct header guard in last commit

Campbell Barton noreply at git.blender.org
Wed Feb 7 05:53:01 CET 2018


Commit: 38d35603f224e92c7f4dfe1802b0ebfceebec46a
Author: Campbell Barton
Date:   Wed Feb 7 15:51:23 2018 +1100
Branches: master
https://developer.blender.org/rB38d35603f224e92c7f4dfe1802b0ebfceebec46a

Correct header guard in last commit

===================================================================

M	source/blender/makesdna/DNA_object_fluidsim_types.h
M	source/blender/makesdna/DNA_object_force_types.h

===================================================================

diff --git a/source/blender/makesdna/DNA_object_fluidsim_types.h b/source/blender/makesdna/DNA_object_fluidsim_types.h
index c2816383ffb..b305235083a 100644
--- a/source/blender/makesdna/DNA_object_fluidsim_types.h
+++ b/source/blender/makesdna/DNA_object_fluidsim_types.h
@@ -29,8 +29,8 @@
  *  \ingroup DNA
  */
 
-#ifndef __DNA_OBJECT_FLUIDSIM_H__
-#define __DNA_OBJECT_FLUIDSIM_H__
+#ifndef __DNA_OBJECT_FLUIDSIM_TYPES_H__
+#define __DNA_OBJECT_FLUIDSIM_TYPES_H__
 
 #include "DNA_ID.h"
 #include "DNA_defs.h"
@@ -189,6 +189,5 @@ typedef struct FluidsimSettings {
 }
 #endif
 
-#endif
-
+#endif  /* __DNA_OBJECT_FLUIDSIM_TYPES_H__ */
 
diff --git a/source/blender/makesdna/DNA_object_force_types.h b/source/blender/makesdna/DNA_object_force_types.h
index 605463be1f1..47467917315 100644
--- a/source/blender/makesdna/DNA_object_force_types.h
+++ b/source/blender/makesdna/DNA_object_force_types.h
@@ -29,8 +29,8 @@
  *  \ingroup DNA
  */
 
-#ifndef __DNA_OBJECT_FORCE_H__
-#define __DNA_OBJECT_FORCE_H__
+#ifndef __DNA_OBJECT_FORCE_TYPES_H__
+#define __DNA_OBJECT_FORCE_TYPES_H__
 
 #ifdef __cplusplus
 extern "C" {
@@ -453,5 +453,5 @@ typedef struct SoftBody {
 }
 #endif
 
-#endif
+#endif  /* __DNA_OBJECT_FORCE_TYPES_H__ */



More information about the Bf-blender-cvs mailing list