Merge branch 'blender2.7'

[blender.git] / intern / dualcon / intern / GeoCommon.h

diff --git a/intern/dualcon/intern/GeoCommon.h b/intern/dualcon/intern/GeoCommon.h
index 3b2789bec87430f0f4b2ed3a06c69e1ad555fdba..45f60a1060a7bd34cd15a21e06d88af6cba08b05 100644 (file)
--- a/intern/dualcon/intern/GeoCommon.h
+++ b/intern/dualcon/intern/GeoCommon.h
@@ -20,8 +20,8 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-#ifndef GEOCOMMON_H
-#define GEOCOMMON_H
+#ifndef __GEOCOMMON_H__
+#define __GEOCOMMON_H__
 
 #define UCHAR unsigned char
 #define USHORT unsigned short
@@ -36,34 +36,29 @@
 
 
 // 3d point with integer coordinates
-typedef struct
-{
+typedef struct {
        int x, y, z;
 } Point3i;
 
-typedef struct
-{
+typedef struct {
        Point3i begin;
        Point3i end;
 } BoundingBox;
 
 // triangle that points to three vertices
-typedef struct 
-{
-       float vt[3][3] ;
+typedef struct {
+       float vt[3][3];
 } Triangle;
 
 // 3d point with float coordinates
-typedef struct
-{
+typedef struct {
        float x, y, z;
 } Point3f;
 
-typedef struct
-{
+typedef struct {
        Point3f begin;
        Point3f end;
 } BoundingBoxf;
 
 
-#endif
+#endif  /* __GEOCOMMON_H__ */