From 51ff7488982c8b8bd00ab378a3dcf519d6e49005 Mon Sep 17 00:00:00 2001
From: gdd <gdd>
Date: Thu, 7 Jun 2012 11:26:11 +0000
Subject: [PATCH] Fix for compilation with gcc 4.7

---
 salome_adm/unix/config_files/check_vtk.m4       | 2 +-
 src/Basics/Basics_DirUtils.cxx                  | 1 +
 src/DSC/DSC_Basic/ConnectionManager_i.cxx       | 2 ++
 src/MPIContainer/MPIObject_i.cxx                | 4 ++++
 src/MPIContainer/testMPI2.cxx                   | 4 ++++
 src/ModuleCatalog/SALOME_ModuleCatalog_impl.cxx | 2 ++
 6 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/salome_adm/unix/config_files/check_vtk.m4 b/salome_adm/unix/config_files/check_vtk.m4
index 416800d63..4cfac1d8e 100644
--- a/salome_adm/unix/config_files/check_vtk.m4
+++ b/salome_adm/unix/config_files/check_vtk.m4
@@ -193,7 +193,7 @@ if test "x$PVHOME" != "x" ; then
   AC_CHECKING(for VTK from ParaView)
 
   PV_LOCAL_INCLUDES="-I$PVHOME/include/paraview$PVVERSION $LOCAL_INCLUDES"
-  PV_LOCAL_LIBS="-L$PVHOME/lib/paraview$PVVERSION -lvtksys -lvtkzlib -lvtkpng -lvtkjpeg -lvtktiff -lvtkexpat -lvtksqlite -lvtkmetaio -lvtkverdict -lvtkNetCDF -lvtkDICOMParser -lvtkfreetype -lvtkftgl -lvtkexoIIc $LOCAL_LIBS"
+  PV_LOCAL_LIBS="-L$PVHOME/lib/paraview$PVVERSION -lvtksys -lvtkmetaio -lvtkverdict -lvtkNetCDF -lvtkDICOMParser -lvtkftgl -lvtkexoIIc $LOCAL_LIBS"
   PV_TRY_LINK_LIBS="-L$PVHOME/lib/paraview$PVVERSION -lvtksys $TRY_LINK_LIBS"
 
   dnl vtk headers
diff --git a/src/Basics/Basics_DirUtils.cxx b/src/Basics/Basics_DirUtils.cxx
index 26bdcb726..22359e8d3 100644
--- a/src/Basics/Basics_DirUtils.cxx
+++ b/src/Basics/Basics_DirUtils.cxx
@@ -29,6 +29,7 @@
 #ifndef WIN32
 # include <sys/stat.h>
 # include <dirent.h>
+# include <unistd.h>
 #else
 # include <windows.h>
 # include <time.h>
diff --git a/src/DSC/DSC_Basic/ConnectionManager_i.cxx b/src/DSC/DSC_Basic/ConnectionManager_i.cxx
index eb187ccd5..4bb08dbae 100644
--- a/src/DSC/DSC_Basic/ConnectionManager_i.cxx
+++ b/src/DSC/DSC_Basic/ConnectionManager_i.cxx
@@ -29,6 +29,8 @@
 
 #ifdef WIN32
 # include <process.h>
+#else
+# include <unistd.h>
 #endif
 
 ConnectionManager_i::ConnectionManager_i(CORBA::ORB_ptr orb) {
diff --git a/src/MPIContainer/MPIObject_i.cxx b/src/MPIContainer/MPIObject_i.cxx
index 08177dc99..94bba7b48 100644
--- a/src/MPIContainer/MPIObject_i.cxx
+++ b/src/MPIContainer/MPIObject_i.cxx
@@ -30,6 +30,10 @@
 
 #define TIMEOUT 5
 
+#ifndef WIN32
+#include <unistd.h>
+#endif
+
 MPIObject_i::MPIObject_i()
 {
   MPI_Comm_size( MPI_COMM_WORLD, &_nbproc );
diff --git a/src/MPIContainer/testMPI2.cxx b/src/MPIContainer/testMPI2.cxx
index a5ea545ac..6a17f9f4c 100644
--- a/src/MPIContainer/testMPI2.cxx
+++ b/src/MPIContainer/testMPI2.cxx
@@ -5,6 +5,10 @@
 #define TIMEOUT 20
 #define EPSILON 0.00000001
 
+#ifndef WIN32
+# include <unistd.h>
+#endif
+
 int main(int argc, char**argv)
 {
   int *indg;
diff --git a/src/ModuleCatalog/SALOME_ModuleCatalog_impl.cxx b/src/ModuleCatalog/SALOME_ModuleCatalog_impl.cxx
index 2a0259284..789c44d4f 100644
--- a/src/ModuleCatalog/SALOME_ModuleCatalog_impl.cxx
+++ b/src/ModuleCatalog/SALOME_ModuleCatalog_impl.cxx
@@ -35,6 +35,8 @@
 
 #ifdef WIN32
 # include <process.h>
+#else
+# include <unistd.h>
 #endif
 
 #ifdef _DEBUG_
-- 
2.39.2