From: vsr <vsr@opencascade.com>
Date: Wed, 15 Oct 2008 13:50:24 +0000 (+0000)
Subject: Issue 0020008: integrate patch for compilation with gcc 4.3.2 (from E.Adam)
X-Git-Tag: V5_1_0a3~16
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=6b8411f1b7b96a8f6ff0201061c4d192eac29706;p=modules%2Fgui.git

Issue 0020008: integrate patch for compilation with gcc 4.3.2 (from E.Adam)
---

diff --git a/adm_local/unix/config_files/check_pyqt.m4 b/adm_local/unix/config_files/check_pyqt.m4
index 68da58e35..34ee10161 100644
--- a/adm_local/unix/config_files/check_pyqt.m4
+++ b/adm_local/unix/config_files/check_pyqt.m4
@@ -130,6 +130,7 @@ if test "x$pyqt_ok" == "xyes" ; then
     TEST_LIB_DIRS="${TEST_LIB_DIRS} /usr/lib${LIB_LOCATION_SUFFIX} /usr/lib${LIB_LOCATION_SUFFIX}/python${PYTHON_VERSION}/site-packages"
     TEST_LIB_DIRS="${TEST_LIB_DIRS} /usr/lib${LIB_LOCATION_SUFFIX}/python${PYTHON_VERSION}/site-packages/PyQt4"
     TEST_SIPS_DIRS="${TEST_SIPS_DIRS} /usr/share/sip"
+    TEST_SIPS_DIRS="${TEST_SIPS_DIRS} /usr/share/sip/PyQt4"
 
     dnl check PyQt libs
     pyqt_ok=no
diff --git a/src/GLViewer/GLViewer_Tools.cxx b/src/GLViewer/GLViewer_Tools.cxx
index 1f270a253..28642e969 100644
--- a/src/GLViewer/GLViewer_Tools.cxx
+++ b/src/GLViewer/GLViewer_Tools.cxx
@@ -27,6 +27,7 @@
 #include <GL/gl.h>
 
 #include <iostream>
+#include <string.h>
 
 /*!
   Constructor
diff --git a/src/Style/Style_Salome.cxx b/src/Style/Style_Salome.cxx
index 63568e4c5..0755b5d6a 100644
--- a/src/Style/Style_Salome.cxx
+++ b/src/Style/Style_Salome.cxx
@@ -60,6 +60,8 @@
 #include <QSlider>
 #include <QMainWindow>
 
+#include <limits.h>
+
 #define SHADOW          1
 #define LINE_GR_MARGIN  10
 #define HIGH_WDG_MARGIN 10
diff --git a/src/VTKViewer/VTKViewer_ConvexTool.cxx b/src/VTKViewer/VTKViewer_ConvexTool.cxx
index 0689ab67a..6ac05bf6d 100644
--- a/src/VTKViewer/VTKViewer_ConvexTool.cxx
+++ b/src/VTKViewer/VTKViewer_ConvexTool.cxx
@@ -31,10 +31,7 @@
 
 #include <set>
 #include <map>
-
-#ifdef WIN32
 #include <algorithm>
-#endif
 
 #include <vtkUnstructuredGrid.h>
 #include <vtkGeometryFilter.h>