From ba72f1d83c8718a5ada4164ebf9aa9595d149f0f Mon Sep 17 00:00:00 2001
From: caremoli <caremoli>
Date: Mon, 18 Feb 2008 09:35:24 +0000
Subject: [PATCH] CCAR: undefine some variables : PACKAGE_NAME, PACKAGE_XXX to
 remove warnings in compilation

---
 salome_adm/unix/SALOMEconfig.ref.in       | 7 +++++++
 src/Utils/Utils_DESTRUCTEUR_GENERIQUE.hxx | 2 ++
 src/Utils/Utils_ORB_INIT.hxx              | 2 ++
 3 files changed, 11 insertions(+)

diff --git a/salome_adm/unix/SALOMEconfig.ref.in b/salome_adm/unix/SALOMEconfig.ref.in
index 22372e97a..20c03488b 100644
--- a/salome_adm/unix/SALOMEconfig.ref.in
+++ b/salome_adm/unix/SALOMEconfig.ref.in
@@ -54,4 +54,11 @@
 /* A path to a ssh-like command */
 #define SSH "@SSH@"
 
+// This is only to suppress warning messages with defines redefined (cause of omniORB that exports these names)
+#undef PACKAGE_BUGREPORT
+#undef PACKAGE_NAME
+#undef PACKAGE_STRING
+#undef PACKAGE_TARNAME
+#undef PACKAGE_VERSION
+
 #endif
diff --git a/src/Utils/Utils_DESTRUCTEUR_GENERIQUE.hxx b/src/Utils/Utils_DESTRUCTEUR_GENERIQUE.hxx
index d429d0daa..9ae866266 100644
--- a/src/Utils/Utils_DESTRUCTEUR_GENERIQUE.hxx
+++ b/src/Utils/Utils_DESTRUCTEUR_GENERIQUE.hxx
@@ -29,6 +29,8 @@
 # if !defined( __DESTRUCTEUR_GENERIQUE__H__ )
 # define __DESTRUCTEUR_GENERIQUE__H__
 
+#include <SALOMEconfig.h>
+
 #include "SALOME_Utils.hxx"
 
 #include <list>
diff --git a/src/Utils/Utils_ORB_INIT.hxx b/src/Utils/Utils_ORB_INIT.hxx
index 672d630c3..e4f8c97f1 100644
--- a/src/Utils/Utils_ORB_INIT.hxx
+++ b/src/Utils/Utils_ORB_INIT.hxx
@@ -29,6 +29,8 @@
 # if ! defined( __ORB_INIT_HXX__ )
 # define __ORB_INIT_HXX__
 
+#include <SALOMEconfig.h>
+
 #include "SALOME_Utils.hxx"
 
 #include "omniORB4/CORBA.h" 
-- 
2.39.2