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 68da58e356233ebe04dfe6ccead7698258879ba6..34ee1016123dce5f939298bc4c5720932b3e3ace 100644 (file)
--- 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 1f270a253f9bff75c83d254c7021b4b265eb426e..28642e9693b7a589df2cfd342fecc0f0c7c81249 100644 (file)
--- 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 63568e4c5e72050698a77f6821b78954e078f628..0755b5d6a39009c362336fdf98973e81966a5507 100644 (file)
--- 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 0689ab67aef41c6bebcae46b0758a824725c86e8..6ac05bf6ddab98196be915a4adcb15114e0923fe 100644 (file)
--- 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>