projects
/
occt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
0028838: Configuration - undefine macros coming from X11 headers in place of collision
[occt.git]
/
src
/
StepBasic
/
StepBasic_Approval.hxx
diff --git
a/src/StepBasic/StepBasic_Approval.hxx
b/src/StepBasic/StepBasic_Approval.hxx
index
1db438d
..
62d006d
100644
(file)
--- a/
src/StepBasic/StepBasic_Approval.hxx
+++ b/
src/StepBasic/StepBasic_Approval.hxx
@@
-24,6
+24,10
@@
class StepBasic_ApprovalStatus;
class TCollection_HAsciiString;
+// resolve name collisions with X11 headers
+#ifdef Status
+ #undef Status
+#endif
class StepBasic_Approval;
DEFINE_STANDARD_HANDLE(StepBasic_Approval, MMgt_TShared)