From cc0a08b8d100fbbd5f91857ce4ed10ab39113bae Mon Sep 17 00:00:00 2001 From: Ismo Puustinen Date: Tue, 13 Aug 2013 16:18:23 +0300 Subject: [PATCH] resource-c: can be called from C++ code. --- src/plugins/resource-native/libmurphy-resource/resource-api.h | 3 +++ src/plugins/resource-native/libmurphy-resource/resource-private.h | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/src/plugins/resource-native/libmurphy-resource/resource-api.h b/src/plugins/resource-native/libmurphy-resource/resource-api.h index e8b2d5b..1ead266 100644 --- a/src/plugins/resource-native/libmurphy-resource/resource-api.h +++ b/src/plugins/resource-native/libmurphy-resource/resource-api.h @@ -34,6 +34,8 @@ #include +MRP_CDECL_BEGIN + typedef struct mrp_res_context_private_s mrp_res_context_private_t; typedef struct mrp_res_resource_private_s mrp_res_resource_private_t; typedef struct mrp_res_resource_set_private_s mrp_res_resource_set_private_t; @@ -429,5 +431,6 @@ typedef void (*mrp_res_logger_t) (mrp_log_level_t level, const char *file, mrp_res_logger_t mrp_res_set_logger(mrp_res_logger_t logger); +MRP_CDECL_END #endif /* __MURPHY_RESOURCE_API_H__ */ diff --git a/src/plugins/resource-native/libmurphy-resource/resource-private.h b/src/plugins/resource-native/libmurphy-resource/resource-private.h index d7152e1..3f49969 100644 --- a/src/plugins/resource-native/libmurphy-resource/resource-private.h +++ b/src/plugins/resource-native/libmurphy-resource/resource-private.h @@ -36,6 +36,8 @@ #include "resource-api.h" +MRP_CDECL_BEGIN + typedef struct { const char *name; mrp_res_attribute_type_t type; /* s:char *, i:int32_t, u:uint32_t, f:double */ @@ -142,4 +144,6 @@ void *u_to_p(uint32_t u); void mrp_res_log_msg(mrp_log_level_t level, const char *file, int line, const char *func, const char *format, ...); +MRP_CDECL_END + #endif /* __MURPHY_RESOURCE_API_PRIVATE_H__ */ -- 2.7.4