osaf/libs/agents/saf/imma/imma_init.cc | 1 -
osaf/libs/agents/saf/imma/imma_om_api.cc | 1 -
osaf/libs/core/mds/include/mds_dl_api.h | 9 +++++++++
osaf/libs/saf/libSaImm/Makefile.am | 4 ++--
osaf/libs/saf/libSaImm/libSaImmOm.map | 14 ++++++++------
5 files changed, 19 insertions(+), 10 deletions(-)
Fix linkage errors.
diff --git a/osaf/libs/agents/saf/imma/imma_init.cc
b/osaf/libs/agents/saf/imma/imma_init.cc
--- a/osaf/libs/agents/saf/imma/imma_init.cc
+++ b/osaf/libs/agents/saf/imma/imma_init.cc
@@ -23,7 +23,6 @@
******************************************************************************/
-#define _GNU_SOURCE
#include <string.h>
#include "imma.h"
diff --git a/osaf/libs/agents/saf/imma/imma_om_api.cc
b/osaf/libs/agents/saf/imma/imma_om_api.cc
--- a/osaf/libs/agents/saf/imma/imma_om_api.cc
+++ b/osaf/libs/agents/saf/imma/imma_om_api.cc
@@ -36,7 +36,6 @@
TRACE_4 library errors ERR_LIBRARY - aproximates ERROR
*****************************************************************************/
-#define _GNU_SOURCE
#include <string.h>
#include <stdlib.h>
diff --git a/osaf/libs/core/mds/include/mds_dl_api.h
b/osaf/libs/core/mds/include/mds_dl_api.h
--- a/osaf/libs/core/mds/include/mds_dl_api.h
+++ b/osaf/libs/core/mds/include/mds_dl_api.h
@@ -30,6 +30,11 @@
#include "ncs_lib.h"
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
uint32_t mds_lib_req(NCS_LIB_REQ_INFO *req);
int mds_auth_server_connect(const char *name, MDS_DEST mds_dest,
int svc_id, int64_t timeout);
@@ -37,4 +42,8 @@ int mds_auth_server_disconnect(const cha
int svc_id, int64_t timeout);
int mds_auth_server_create(const char *name);
+#ifdef __cplusplus
+}
#endif
+
+#endif
diff --git a/osaf/libs/saf/libSaImm/Makefile.am
b/osaf/libs/saf/libSaImm/Makefile.am
--- a/osaf/libs/saf/libSaImm/Makefile.am
+++ b/osaf/libs/saf/libSaImm/Makefile.am
@@ -35,7 +35,7 @@ libSaImmOi_la_CPPFLAGS = \
if HAVE_LD_VERSION_SCRIPT
libSaImmOi_la_LDFLAGS = \
-Wl,-version-script=$(top_srcdir)/osaf/libs/saf/libSaImm/libSaImmOi.map
\
- -version-number $(OILIB_VERSION)
+ -version-number $(OILIB_VERSION) -lstdc++
else
libSaImmOi_la_LDFLAGS = \
-version-number $(OILIB_VERSION)
@@ -56,7 +56,7 @@ libSaImmOm_la_CPPFLAGS = \
if HAVE_LD_VERSION_SCRIPT
libSaImmOm_la_LDFLAGS = \
-Wl,-version-script=$(top_srcdir)/osaf/libs/saf/libSaImm/libSaImmOm.map
\
- -version-number $(OMLIB_VERSION)
+ -version-number $(OMLIB_VERSION) -lstdc++
else
libSaImmOm_la_LDFLAGS = \
-version-number $(OMLIB_VERSION)
diff --git a/osaf/libs/saf/libSaImm/libSaImmOm.map
b/osaf/libs/saf/libSaImm/libSaImmOm.map
--- a/osaf/libs/saf/libSaImm/libSaImmOm.map
+++ b/osaf/libs/saf/libSaImm/libSaImmOm.map
@@ -10,12 +10,14 @@ OPENSAF_IMM_A.02.01 {
saImmOm*;
immsv_finalize_sync; # FIXME immsv* should be in
libimmsv_common.so
immsv_sync;
- immsv_om_augment_ccb_initialize;
- immsv_om_augment_ccb_get_result;
- immsv_om_augment_ccb_get_admo_name;
- immsv_om_handle_initialize;
- immsv_om_admo_handle_initialize;
- immsv_om_handle_finalize;
+ extern "C++" {
+ "immsv_om_handle_initialize(unsigned long long*,
SaVersionT*)";
+ "immsv_om_handle_finalize(unsigned long long)";
+ "immsv_om_admo_handle_initialize(unsigned long long,
char*, unsigned long long*)";
+ "immsv_om_augment_ccb_initialize(unsigned long long,
unsigned int, unsigned int, unsigned long long*, unsigned long long*)";
+ "immsv_om_augment_ccb_get_admo_name(unsigned long long,
SaNameT*, SaNameT*)";
+ "immsv_om_augment_ccb_get_result(unsigned long long,
unsigned int)"
+ };
local:
*;
};
------------------------------------------------------------------------------
Developer Access Program for Intel Xeon Phi Processors
Access to Intel Xeon Phi processor-based developer platforms.
With one year of Intel Parallel Studio XE.
Training and support from Colfax.
Order your platform today. http://sdm.link/xeonphi
_______________________________________________
Opensaf-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
