From d7171cd6d20c5ca58aced3e12348887984d9d4db Mon Sep 17 00:00:00 2001
From: caremoli <caremoli>
Date: Mon, 18 Feb 2008 09:36:52 +0000
Subject: [PATCH] CCAR: remove warnings in compilation on already defined
 variables

---
 src/Notification/CosNotifyShorthands.h            | 2 ++
 src/Notification/Makefile.am                      | 1 +
 src/SALOMEDS/SALOMEDS_Driver_i.hxx                | 3 ++-
 src/SALOMETraceCollector/SALOMETraceCollector.cxx | 2 ++
 4 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/Notification/CosNotifyShorthands.h b/src/Notification/CosNotifyShorthands.h
index 2cb2d3010..271a3776f 100644
--- 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 74fb69e07..1259fbd1c 100644
--- 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 da3a87e2e..1a61bc496 100644
--- 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 73163eea4..b1286b915 100644
--- 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>
-- 
2.39.2