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/ShapeUpgrade/ShapeUpgrade_FaceDivide.hxx

@@ -21,16 +21,17 @@
 #include <Standard_Type.hxx>
 
 #include <TopoDS_Face.hxx>
-#include <TopoDS_Shape.hxx>
 #include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
 #include <ShapeUpgrade_Tool.hxx>
 #include <ShapeExtend_Status.hxx>
 class ShapeUpgrade_SplitSurface;
 class ShapeUpgrade_WireDivide;
-class TopoDS_Face;
-class TopoDS_Shape;
 
+// resolve name collisions with X11 headers
+#ifdef Status
+  #undef Status
+#endif
 
 class ShapeUpgrade_FaceDivide;
 DEFINE_STANDARD_HANDLE(ShapeUpgrade_FaceDivide, ShapeUpgrade_Tool)

src/ShapeUpgrade/ShapeUpgrade_FixSmallCurves.hxx

@@ -28,11 +28,13 @@
 #include <ShapeExtend_Status.hxx>
 class ShapeUpgrade_SplitCurve3d;
 class ShapeUpgrade_SplitCurve2d;
-class TopoDS_Edge;
-class TopoDS_Face;
 class Geom_Curve;
 class Geom2d_Curve;
 
+// resolve name collisions with X11 headers
+#ifdef Status
+  #undef Status
+#endif
 
 class ShapeUpgrade_FixSmallCurves;
 DEFINE_STANDARD_HANDLE(ShapeUpgrade_FixSmallCurves, ShapeUpgrade_Tool)

src/ShapeUpgrade/ShapeUpgrade_RemoveInternalWires.hxx

@@ -28,8 +28,11 @@
 #include <Standard_Integer.hxx>
 #include <ShapeUpgrade_Tool.hxx>
 #include <ShapeExtend_Status.hxx>
-class TopoDS_Shape;
 
+// resolve name collisions with X11 headers
+#ifdef Status
+  #undef Status
+#endif
 
 class ShapeUpgrade_RemoveInternalWires;
 DEFINE_STANDARD_HANDLE(ShapeUpgrade_RemoveInternalWires, ShapeUpgrade_Tool)

src/ShapeUpgrade/ShapeUpgrade_ShapeDivide.hxx

@@ -30,9 +30,12 @@
 class ShapeUpgrade_FaceDivide;
 class ShapeBuild_ReShape;
 class ShapeExtend_BasicMsgRegistrator;
-class TopoDS_Shape;
 class Message_Msg;
 
+// resolve name collisions with X11 headers
+#ifdef Status
+  #undef Status
+#endif
 
 //! Divides a all faces in shell with given criteria Shell.
 class ShapeUpgrade_ShapeDivide 

src/ShapeUpgrade/ShapeUpgrade_SplitCurve.hxx

@@ -27,6 +27,10 @@
 #include <Standard_Boolean.hxx>
 #include <ShapeExtend_Status.hxx>
 
+// resolve name collisions with X11 headers
+#ifdef Status
+  #undef Status
+#endif
 
 class ShapeUpgrade_SplitCurve;
 DEFINE_STANDARD_HANDLE(ShapeUpgrade_SplitCurve, MMgt_TShared)

src/ShapeUpgrade/ShapeUpgrade_SplitSurface.hxx

@@ -29,6 +29,10 @@
 class Geom_Surface;
 class ShapeExtend_CompositeSurface;
 
+// resolve name collisions with X11 headers
+#ifdef Status
+  #undef Status
+#endif
 
 class ShapeUpgrade_SplitSurface;
 DEFINE_STANDARD_HANDLE(ShapeUpgrade_SplitSurface, MMgt_TShared)

src/ShapeUpgrade/ShapeUpgrade_WireDivide.hxx

@@ -31,12 +31,14 @@ class ShapeUpgrade_SplitCurve2d;
 class ShapeUpgrade_EdgeDivide;
 class ShapeAnalysis_TransferParameters;
 class ShapeUpgrade_FixSmallCurves;
-class TopoDS_Wire;
-class TopoDS_Face;
 class Geom_Surface;
 class TopoDS_Edge;
 class TopLoc_Location;
 
+// resolve name collisions with X11 headers
+#ifdef Status
+  #undef Status
+#endif
 
 class ShapeUpgrade_WireDivide;
 DEFINE_STANDARD_HANDLE(ShapeUpgrade_WireDivide, ShapeUpgrade_Tool)