From b1d0e9c669ab9ffee3781e6442e1023bba961a07 Mon Sep 17 00:00:00 2001
From: apo <apo@opencascade.com>
Date: Thu, 6 Oct 2005 15:36:30 +0000
Subject: [PATCH] Porting on Mandrake

---
 src/SVTK/SALOME_Actor.h                | 9 +++++++--
 src/SVTK/SVTK_InteractorStyle.cxx      | 4 ----
 src/SVTK/SVTK_RenderWindowInteractor.h | 6 ++++++
 src/SVTK/SVTK_Renderer.cxx             | 5 +++++
 4 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/src/SVTK/SALOME_Actor.h b/src/SVTK/SALOME_Actor.h
index 870f327a1..2e9996f4f 100644
--- a/src/SVTK/SALOME_Actor.h
+++ b/src/SVTK/SALOME_Actor.h
@@ -33,10 +33,15 @@
 #include "SVTK_Selector.h"
 #include "SVTK.h"
 
-#include "VTKViewer_Actor.h"
-
 #include "SALOME_InteractiveObject.hxx"
 
+// undefining min and max because CASCADE's defines them and
+// it clashes with std::min(), std::max()
+#undef min
+#undef max
+
+#include "VTKViewer_Actor.h"
+
 #include <string>
 #include <vector>
 
diff --git a/src/SVTK/SVTK_InteractorStyle.cxx b/src/SVTK/SVTK_InteractorStyle.cxx
index 59ece223d..a1278dd35 100644
--- a/src/SVTK/SVTK_InteractorStyle.cxx
+++ b/src/SVTK/SVTK_InteractorStyle.cxx
@@ -63,10 +63,6 @@
 //VRV: porting on Qt 3.0.5
 #include <algorithm>
 
-// undefining min and max because CASCADE's Xw_Extensions.hxx defines them and
-// it clashes with std::min(), std::max() included in utilities.h
-#undef min
-#undef max
 #include "utilities.h"
 
 using namespace std;
diff --git a/src/SVTK/SVTK_RenderWindowInteractor.h b/src/SVTK/SVTK_RenderWindowInteractor.h
index acfabc3a4..efcb40f8d 100644
--- a/src/SVTK/SVTK_RenderWindowInteractor.h
+++ b/src/SVTK/SVTK_RenderWindowInteractor.h
@@ -34,6 +34,12 @@
 
 #include <vtkSmartPointer.h>
 #include <qwidget.h>
+
+// undefining min and max because CASCADE's defines them and
+// it clashes with std::min(), std::max()
+#undef min
+#undef max
+
 #include <stack>
 
 class vtkGenericRenderWindowInteractor;
diff --git a/src/SVTK/SVTK_Renderer.cxx b/src/SVTK/SVTK_Renderer.cxx
index 8625cbb37..a63f35e65 100644
--- a/src/SVTK/SVTK_Renderer.cxx
+++ b/src/SVTK/SVTK_Renderer.cxx
@@ -42,6 +42,11 @@
 #include <vtkObjectFactory.h>
 #include <vtkCallbackCommand.h>
 
+// undefining min and max because CASCADE's defines them and
+// it clashes with std::min(), std::max() included in utilities.h
+#undef min
+#undef max
+
 #include "utilities.h"
 
 #ifdef _DEBUG_
-- 
2.39.2