Header guard and macro-protection for measures3d header

git-svn-id: http://svn.osgeo.org/postgis/trunk@13549 b70326c6-7e19-0410-871a-916f4a2858ee

diff --git a/liblwgeom/measures3d.h b/liblwgeom/measures3d.h
index ad0b48b4c512be9ddadfa4c2be3bfa1385973830..ea0a2f30f03d18011d3aba8576a19bddc7d8013e 100644 (file)
--- a/liblwgeom/measures3d.h
+++ b/liblwgeom/measures3d.h
@@ -1,4 +1,3 @@
-
 /**********************************************************************
  *
  * PostGIS - Spatial Types for PostgreSQL
@@ -10,10 +9,13 @@
  *
  **********************************************************************/
 
+#ifndef _MEASURES3D_H
+#define _MEASURES3D_H 1
+
 #include "measures.h"
 
-#define DOT(u,v)   (u.x * v.x + u.y * v.y + u.z * v.z)
-#define VECTORLENGTH(v)   sqrt((v.x * v.x) + (v.y * v.y) + (v.z * v.z))
+#define DOT(u,v)   ((u).x * (v).x + (u).y * (v).y + (u).z * (v).z)
+#define VECTORLENGTH(v)   sqrt(((v).x * (v).x) + ((v).y * (v).y) + ((v).z * (v).z))
 
 
 /**
@@ -105,3 +107,5 @@ get_3dcross_product(VECTOR3D *v1,VECTOR3D *v2, VECTOR3D *v)
 
        return LW_TRUE;
 }
+
+#endif /* !defined _MEASURES3D_H  */