0028838: Configuration - undefine macros coming from X11 headers in place of collision

The macros Status, Convex, Opposite, FillSolid (coming from X11 headers)
are now undefined in place of definition of methods with same name in OCCT headers.
The usage of variables with name Status is now avoided.

GL_GLEXT_LEGACY is now defined only if not already defined.

The macros AddPrinter (coming from WinAPI headers) is now undefined
within Message_Messenger class definition having method with the same name.
CurrentDirectory macro is now undefined in OSD_Process.hxx.

src/ShapeAnalysis/ShapeAnalysis_BoxBndTree.hxx

@@ -84,8 +84,8 @@ class ShapeAnalysis_BoxBndTreeSelector
   Standard_Boolean ContWire(Standard_Integer nbWire)
     { return myList.Contains(nbWire); }
   
-  inline Standard_Boolean LastCheckStatus (const ShapeExtend_Status Status) const
-    { return ShapeExtend::DecodeStatus ( myStatus, Status ); }
+  inline Standard_Boolean LastCheckStatus (const ShapeExtend_Status theStatus) const
+    { return ShapeExtend::DecodeStatus ( myStatus, theStatus ); }
     
   Standard_Boolean Reject (const Bnd_Box& theBnd) const;
   Standard_Boolean Accept (const Standard_Integer &);

src/ShapeAnalysis/ShapeAnalysis_CheckSmallFace.hxx

@@ -34,6 +34,10 @@ class gp_Pnt;
 class TopoDS_Edge;
 class TopoDS_Compound;
 
+// resolve name collisions with X11 headers
+#ifdef Status
+  #undef Status
+#endif
 
 //! Analysis of the face size
 class ShapeAnalysis_CheckSmallFace 

src/ShapeAnalysis/ShapeAnalysis_Edge.hxx

@@ -37,6 +37,10 @@ class gp_Vec2d;
 class gp_Pnt;
 class Adaptor3d_Curve;
 
+// resolve name collisions with X11 headers
+#ifdef Status
+  #undef Status
+#endif
 
 //! Tool for analyzing the edge.
 //! Queries geometrical representations of the edge (3d curve, pcurve

src/ShapeAnalysis/ShapeAnalysis_Wire.hxx

@@ -35,7 +35,6 @@
 class ShapeExtend_WireData;
 class ShapeAnalysis_Surface;
 class TopoDS_Wire;
-class TopoDS_Face;
 class Geom_Surface;
 class TopLoc_Location;
 class ShapeAnalysis_WireOrder;
@@ -44,6 +43,10 @@ class gp_Pnt2d;
 class TopoDS_Shape;
 class TopoDS_Edge;
 
+// resolve name collisions with X11 headers
+#ifdef Status
+  #undef Status
+#endif
 
 class ShapeAnalysis_Wire;
 DEFINE_STANDARD_HANDLE(ShapeAnalysis_Wire, MMgt_TShared)

src/ShapeAnalysis/ShapeAnalysis_WireOrder.hxx

@@ -30,6 +30,10 @@ class Standard_TypeMismatch;
 class gp_XYZ;
 class gp_XY;
 
+// resolve name collisions with X11 headers
+#ifdef Status
+  #undef Status
+#endif
 
 //! This class is intended to control and, if possible, redefine
 //! the order of a list of edges which define a wire

src/ShapeAnalysis/ShapeAnalysis_WireVertex.hxx

@@ -31,6 +31,10 @@ class ShapeExtend_WireData;
 class TopoDS_Wire;
 class gp_XYZ;
 
+// resolve name collisions with X11 headers
+#ifdef Status
+  #undef Status
+#endif
 
 //! Analyzes and records status of vertices in a Wire
 //!