$OpenBSD$

Index: Externals/OPCODE/OPC_Point.h
--- Externals/OPCODE/OPC_Point.h.orig
+++ Externals/OPCODE/OPC_Point.h
@@ -14,7 +14,7 @@
 
 enum PointComponent
 {
-    _X = 0,
+    _XX = 0,
     _Y = 1,
     _Z = 2,
     _W = 3,
@@ -44,7 +44,7 @@ class ICEMATHS_API icePoint (public)
     //! Constructor from floats
     inline_ Point(float _x, float _y, float _z) : x(_x), y(_y), z(_z) {}
     //! Constructor from array
-    inline_ Point(float f[3]) : x(f[_X]), y(f[_Y]), z(f[_Z]) {}
+    inline_ Point(float f[3]) : x(f[_XX]), y(f[_Y]), z(f[_Z]) {}
     //! Copy constructor
     inline_ Point(const Point& p) : x(p.x), y(p.y), z(p.z) {}
     //! Destructor
@@ -85,7 +85,7 @@ class ICEMATHS_API icePoint (public)
     //! Assignment from array
     inline_ Point& Set(float f[3])
     {
-        x = f[_X];
+        x = f[_XX];
         y = f[_Y];
         z = f[_Z];
         return *this;
@@ -118,7 +118,7 @@ class ICEMATHS_API icePoint (public)
     //! Adds a vector3
     inline_ Point& Add(float f[3])
     {
-        x += f[_X];
+        x += f[_XX];
         y += f[_Y];
         z += f[_Z];
         return *this;
@@ -151,7 +151,7 @@ class ICEMATHS_API icePoint (public)
     //! Subtracts a vector3
     inline_ Point& Sub(float f[3])
     {
-        x -= f[_X];
+        x -= f[_XX];
         y -= f[_Y];
         z -= f[_Z];
         return *this;
@@ -463,7 +463,7 @@ class ICEMATHS_API icePoint (public)
     inline_ PointComponent LargestAxis() const
     {
         const float* Vals = &x;
-        PointComponent m = _X;
+        PointComponent m = _XX;
         if (Vals[_Y] > Vals[m])
             m = _Y;
         if (Vals[_Z] > Vals[m])
@@ -475,7 +475,7 @@ class ICEMATHS_API icePoint (public)
     inline_ PointComponent ClosestAxis() const
     {
         const float* Vals = &x;
-        PointComponent m = _X;
+        PointComponent m = _XX;
         if (AIR(Vals[_Y]) > AIR(Vals[m]))
             m = _Y;
         if (AIR(Vals[_Z]) > AIR(Vals[m]))
@@ -487,7 +487,7 @@ class ICEMATHS_API icePoint (public)
     inline_ PointComponent SmallestAxis() const
     {
         const float* Vals = &x;
-        PointComponent m = _X;
+        PointComponent m = _XX;
         if (Vals[_Y] < Vals[m])
             m = _Y;
         if (Vals[_Z] < Vals[m])
