CCAR: remove warnings in compilation on already defined variables

diff --git a/src/Notification/CosNotifyShorthands.h b/src/Notification/CosNotifyShorthands.h
index 2cb2d3010d750a05b42394a71b09a93d18fd8ca1..271a3776ff9429be5e2e4d11c71584f5642361e5 100644 (file)
--- a/src/Notification/CosNotifyShorthands.h
+++ b/src/Notification/CosNotifyShorthands.h
@@ -27,6 +27,8 @@
 #ifndef _COS_NOTIFY_H_
 #define _COS_NOTIFY_H_
 
+#include <SALOMEconfig.h>
+
 #ifndef COS_USES_BOA
 #include <COS/TimeBase.hh>
 #include <COS/CosNotification.hh>

diff --git a/src/Notification/Makefile.am b/src/Notification/Makefile.am
index 74fb69e07264dbb745f20db56c965f807008a8b1..1259fbd1c1f68d5b88ba8cdc80ff70a23089085b 100644 (file)
--- a/src/Notification/Makefile.am
+++ b/src/Notification/Makefile.am
@@ -57,6 +57,7 @@ libSalomeNotification_la_CPPFLAGS =\
        -I$(srcdir)/../Basics \
        -I$(srcdir)/../SALOMELocalTrace \
        -I$(srcdir)/../Utils \
+       -I$(top_builddir)/salome_adm/unix \
        @CORBA_CXXFLAGS@ @CORBA_INCLUDES@
 
 

diff --git a/src/SALOMEDS/SALOMEDS_Driver_i.hxx b/src/SALOMEDS/SALOMEDS_Driver_i.hxx
index da3a87e2e081394ffb304ed5774e9173cfa56a77..1a61bc49603a6395a42e109a20c0e024aa7b2fc9 100644 (file)
--- a/src/SALOMEDS/SALOMEDS_Driver_i.hxx
+++ b/src/SALOMEDS/SALOMEDS_Driver_i.hxx
@@ -20,12 +20,13 @@
 #ifndef __SALOMEDS_DRIVER_I_H__
 #define __SALOMEDS_DRIVER_I_H__
 
+#include <SALOMEconfig.h>
+
 #include <omniORB4/CORBA.h>
 #include "SALOMEDSImpl_Driver.hxx"
 #include "SALOMEDSImpl_SComponent.hxx"
 #include "SALOMEDSImpl_SObject.hxx"
 
-#include <SALOMEconfig.h>   
 #include CORBA_SERVER_HEADER(SALOMEDS) 
 #include CORBA_SERVER_HEADER(SALOME_Component)
 

diff --git a/src/SALOMETraceCollector/SALOMETraceCollector.cxx b/src/SALOMETraceCollector/SALOMETraceCollector.cxx
index 73163eea427259b939ec0fd08dbe0e8f2f420545..b1286b9159ce0e64d7e34e80849e5aea333deed2 100644 (file)
--- a/src/SALOMETraceCollector/SALOMETraceCollector.cxx
+++ b/src/SALOMETraceCollector/SALOMETraceCollector.cxx
@@ -24,6 +24,8 @@
 //  Module : KERNEL
 //  $Header$
 
+#include <SALOMEconfig.h>
+
 #include <iostream>
 #include <sstream>
 #include <fstream>