mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-08-14 13:30:48 +03:00
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.
This commit is contained in:
@@ -41,7 +41,7 @@ TopOpeBRepBuild_FaceBuilder.hxx
|
||||
TopOpeBRepBuild_fctwes.cxx
|
||||
TopOpeBRepBuild_ffsfs.cxx
|
||||
TopOpeBRepBuild_ffwesk.cxx
|
||||
TopOpeBRepBuild_Fill.hxx
|
||||
TopOpeBRepBuild_Fill.pxx
|
||||
TopOpeBRepBuild_FREGU.cxx
|
||||
TopOpeBRepBuild_FuseFace.cxx
|
||||
TopOpeBRepBuild_FuseFace.hxx
|
||||
@@ -111,7 +111,7 @@ TopOpeBRepBuild_SolidBuilder.hxx
|
||||
TopOpeBRepBuild_SplitEdge.hxx
|
||||
TopOpeBRepBuild_SplitFace.hxx
|
||||
TopOpeBRepBuild_SplitShapes.hxx
|
||||
TopOpeBRepBuild_SplitSolid.hxx
|
||||
TopOpeBRepBuild_SplitSolid.pxx
|
||||
TopOpeBRepBuild_SREGU.cxx
|
||||
TopOpeBRepBuild_Tools.cxx
|
||||
TopOpeBRepBuild_Tools.hxx
|
||||
|
@@ -75,9 +75,9 @@ Standard_EXPORT void debchangesplit(const Standard_Integer i) {cout<<"++ debchan
|
||||
static Standard_Integer STATIC_SOLIDINDEX = 0;
|
||||
#include <TopOpeBRepBuild_SplitEdge.hxx>
|
||||
#include <TopOpeBRepBuild_SplitFace.hxx>
|
||||
#include <TopOpeBRepBuild_SplitSolid.hxx>
|
||||
#include "TopOpeBRepBuild_SplitSolid.pxx"
|
||||
#include <TopOpeBRepBuild_SplitShapes.hxx>
|
||||
#include <TopOpeBRepBuild_Fill.hxx>
|
||||
#include "TopOpeBRepBuild_Fill.pxx"
|
||||
|
||||
Standard_EXPORT TopOpeBRepBuild_Builder* GLOBAL_PBUILDER;
|
||||
|
||||
|
@@ -52,8 +52,6 @@
|
||||
class TopOpeBRepDS_HDataStructure;
|
||||
class Standard_NoSuchObject;
|
||||
class TopOpeBRepBuild_HBuilder;
|
||||
class TopOpeBRepDS_BuildTool;
|
||||
class TopoDS_Shape;
|
||||
class TopOpeBRepTool_ShapeExplorer;
|
||||
class TopOpeBRepBuild_ShapeSet;
|
||||
class TopOpeBRepBuild_EdgeBuilder;
|
||||
@@ -67,11 +65,12 @@ class TopOpeBRepBuild_ShellFaceSet;
|
||||
class TopOpeBRepDS_SurfaceIterator;
|
||||
class TopOpeBRepDS_CurveIterator;
|
||||
class TopoDS_Vertex;
|
||||
class TopoDS_Edge;
|
||||
class gp_Pnt;
|
||||
class TopoDS_Face;
|
||||
class TCollection_AsciiString;
|
||||
|
||||
// resolve name collisions with X11 headers
|
||||
#ifdef FillSolid
|
||||
#undef FillSolid
|
||||
#endif
|
||||
|
||||
//! The Builder algorithm constructs topological
|
||||
//! objects from an existing topology and new
|
||||
|
Reference in New Issue
Block a user