Fixed DLOPEN define warning.

Unconditionally defining DLOPEN_POSIX for cpluff was causing redefinintion errors once
it started being passed in on the command-line. Added conditional guards to prevent the
warnings.

Change-Id: Ieb40909b77710fa46209465e4e924569059738c5
Signed-off-by: Jon A. Cruz <jonc@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/451
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
Reviewed-by: Sudarshan Prasad <sudarshan.prasad@intel.com>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>

diff --git a/service/protocol-plugin/plugin-manager/src/CpluffAdapter.h b/service/protocol-plugin/plugin-manager/src/CpluffAdapter.h
index 9cc96d0..1f96a13 100644 (file)
--- a/service/protocol-plugin/plugin-manager/src/CpluffAdapter.h
+++ b/service/protocol-plugin/plugin-manager/src/CpluffAdapter.h
@@ -25,7 +25,9 @@
 
 #ifndef __CPLUFFADAPTER_H
 #define __CPLUFFADAPTER_H
+#ifndef DLOPEN_POSIX
 #define DLOPEN_POSIX
+#endif
 
 #include <vector>
 #include <dirent.h>

diff --git a/service/protocol-plugin/plugin-manager/src/FelixAdapter.h b/service/protocol-plugin/plugin-manager/src/FelixAdapter.h
index fd16cc2..918c1c3 100644 (file)
--- a/service/protocol-plugin/plugin-manager/src/FelixAdapter.h
+++ b/service/protocol-plugin/plugin-manager/src/FelixAdapter.h
@@ -25,7 +25,9 @@
 
 #ifndef __FELIXADAPTER_H__
 #define __FELIXADAPTER_H__
+#ifndef DLOPEN_POSIX
 #define DLOPEN_POSIX
+#endif
 
 #include <vector>
 #include <dirent.h>

diff --git a/service/protocol-plugin/plugin-manager/src/PluginManager.h b/service/protocol-plugin/plugin-manager/src/PluginManager.h
index 777b376..a407317 100644 (file)
--- a/service/protocol-plugin/plugin-manager/src/PluginManager.h
+++ b/service/protocol-plugin/plugin-manager/src/PluginManager.h
@@ -25,7 +25,9 @@
 
 #ifndef __PLUGINMANAGER_H
 #define __PLUGINMANAGER_H
+#ifndef DLOPEN_POSIX
 #define DLOPEN_POSIX
+#endif
 
 #include <vector>
 #include <dirent.h>