0028838: Configuration - undefine macros coming from X11 headers in place of collision
authorkgv <kgv@opencascade.com>
Fri, 3 Feb 2017 19:27:02 +0000 (23:27 +0400)
committerbugmaster <bugmaster@opencascade.com>
Thu, 15 Jun 2017 12:27:36 +0000 (15:27 +0300)
commit9fd2d2c3828d504bc7e8b8e204852b1bc9df02aa
tree66cc679d0c32f8903c578e0b6518871024a1ee18
parente3d02d1f845e3bf789f6c2f651885c1979cb03e0
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.
103 files changed:
src/BRepFeat/BRepFeat_MakeCylindricalHole.hxx
src/BRepFilletAPI/BRepFilletAPI_MakeFillet2d.hxx
src/BRepOffset/BRepOffset.cxx
src/BRepOffset/BRepOffset.hxx
src/BRepOffset/BRepOffset_Offset.hxx
src/BRepOffsetAPI/BRepOffsetAPI_DraftAngle.hxx
src/BRepOffsetAPI/BRepOffsetAPI_MakePipeShell.cxx
src/BRepTools/BRepTools_ReShape.hxx
src/BRepTopAdaptor/BRepTopAdaptor_FClass2d.cxx
src/BSplCLib/BSplCLib.hxx
src/BSplCLib/BSplCLib_2.cxx
src/BSplCLib/BSplCLib_CurveComputation.gxx
src/BSplSLib/BSplSLib.cxx
src/BSplSLib/BSplSLib.hxx
src/CDM/CDM_Application.cxx
src/CDM/CDM_Application.hxx
src/CSLib/CSLib.cxx
src/CSLib/CSLib.hxx
src/ChFi2d/ChFi2d_Builder.hxx
src/ChFiDS/ChFiDS_Spine.hxx
src/DNaming/DNaming.cxx
src/DNaming/DNaming.hxx
src/DNaming/DNaming_BasicCommands.cxx
src/FairCurve/FairCurve_EnergyOfBatten.hxx
src/FairCurve/FairCurve_EnergyOfMVC.hxx
src/GC/GC_Root.hxx
src/GCE2d/GCE2d_Root.hxx
src/Geom2dConvert/Geom2dConvert.cxx
src/Geom2dHatch/Geom2dHatch_Hatcher.hxx
src/Geom2dHatch/Geom2dHatch_Hatching.cxx
src/Geom2dHatch/Geom2dHatch_Hatching.hxx
src/GeomConvert/GeomConvert.cxx
src/HLRBRep/HLRBRep_EdgeData.hxx
src/HLRBRep/HLRBRep_PolyAlgo.cxx
src/IGESSelect/IGESSelect_SelectSubordinate.hxx
src/IntAna/IntAna_IntQuadQuad.cxx
src/IntAna/IntAna_IntQuadQuad.hxx
src/IntCurve/IntCurve_IntConicConic_1.cxx
src/IntTools/IntTools_FClass2d.cxx
src/IntWalk/IntWalk_IWalking_3.gxx
src/IntWalk/IntWalk_IWalking_4.gxx
src/IntWalk/IntWalk_IWalking_5.gxx
src/IntWalk/IntWalk_PWalking.cxx
src/Interface/Interface_Check.hxx
src/Interface/Interface_CheckIterator.hxx
src/Interface/Interface_Graph.hxx
src/InterfaceGraphic/InterfaceGraphic.hxx
src/LProp/LProp_SLProps.gxx
src/MeshTest/MeshTest.cxx
src/Message/Message_Messenger.hxx
src/OSD/OSD_Process.cxx
src/OSD/OSD_Process.hxx
src/OpenGl/OpenGl_GlFunctions.hxx
src/QABugs/QABugs_18.cxx
src/QABugs/QABugs_20.cxx
src/QADNaming/QADNaming.cxx
src/QADNaming/QADNaming.hxx
src/QADNaming/QADNaming_BasicCommands.cxx
src/Resource/Resource_Manager.cxx
src/SelectMgr/SelectMgr_ViewerSelector.hxx
src/ShapeAnalysis/ShapeAnalysis_BoxBndTree.hxx
src/ShapeAnalysis/ShapeAnalysis_CheckSmallFace.hxx
src/ShapeAnalysis/ShapeAnalysis_Edge.hxx
src/ShapeAnalysis/ShapeAnalysis_Wire.hxx
src/ShapeAnalysis/ShapeAnalysis_WireOrder.hxx
src/ShapeAnalysis/ShapeAnalysis_WireVertex.hxx
src/ShapeBuild/ShapeBuild_ReShape.hxx
src/ShapeConstruct/ShapeConstruct_ProjectCurveOnSurface.cxx
src/ShapeConstruct/ShapeConstruct_ProjectCurveOnSurface.hxx
src/ShapeFix/ShapeFix_ComposeShell.hxx
src/ShapeFix/ShapeFix_Edge.hxx
src/ShapeFix/ShapeFix_Face.hxx
src/ShapeFix/ShapeFix_Shape.hxx
src/ShapeFix/ShapeFix_Shell.hxx
src/ShapeFix/ShapeFix_Solid.hxx
src/ShapeUpgrade/ShapeUpgrade_FaceDivide.hxx
src/ShapeUpgrade/ShapeUpgrade_FixSmallCurves.hxx
src/ShapeUpgrade/ShapeUpgrade_RemoveInternalWires.hxx
src/ShapeUpgrade/ShapeUpgrade_ShapeDivide.hxx
src/ShapeUpgrade/ShapeUpgrade_SplitCurve.hxx
src/ShapeUpgrade/ShapeUpgrade_SplitSurface.hxx
src/ShapeUpgrade/ShapeUpgrade_WireDivide.hxx
src/StepBasic/StepBasic_ApplicationProtocolDefinition.hxx
src/StepBasic/StepBasic_Approval.hxx
src/StlTransfer/StlTransfer.cxx
src/TNaming/TNaming_NamedShape.cxx
src/TopOpeBRep/TopOpeBRep_Point2d.hxx
src/TopOpeBRepBuild/FILES
src/TopOpeBRepBuild/TopOpeBRepBuild_Builder.cxx
src/TopOpeBRepBuild/TopOpeBRepBuild_Builder.hxx
src/TopOpeBRepBuild/TopOpeBRepBuild_Fill.pxx [moved from src/TopOpeBRepBuild/TopOpeBRepBuild_Fill.hxx with 100% similarity]
src/TopOpeBRepBuild/TopOpeBRepBuild_SplitSolid.pxx [moved from src/TopOpeBRepBuild/TopOpeBRepBuild_SplitSolid.hxx with 100% similarity]
src/TopoDS/TopoDS_Shape.hxx
src/TopoDS/TopoDS_TShape.hxx
src/TopoDS/TopoDS_TVertex.hxx
src/Transfer/Transfer_Binder.hxx
src/Transfer/Transfer_TransferIterator.hxx
src/VrmlConverter/VrmlConverter_ShadedShape.cxx
src/VrmlData/VrmlData_Scene.hxx
src/gce/gce_Root.hxx
src/math/math_IntegerVector.hxx
src/math/math_Matrix.hxx
src/math/math_Vector.hxx