You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@celix.apache.org by pn...@apache.org on 2018/10/12 09:03:40 UTC
[23/34] celix git commit: CELIX-454: Fixes an typo in the psa service
CELIX-454: Fixes an typo in the psa service
Project: http://git-wip-us.apache.org/repos/asf/celix/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/07a491b7
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/07a491b7
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/07a491b7
Branch: refs/heads/develop
Commit: 07a491b7ede1c2c96a11fc4e5213314d134ad3b7
Parents: b29bb91
Author: Pepijn Noltes <pe...@gmail.com>
Authored: Mon Oct 1 12:56:42 2018 +0200
Committer: Pepijn Noltes <pe...@gmail.com>
Committed: Mon Oct 1 12:56:58 2018 +0200
----------------------------------------------------------------------
bundles/pubsub/pubsub_admin_udp_mc/src/psa_activator.c | 4 ++--
bundles/pubsub/pubsub_admin_zmq/src/psa_activator.c | 4 ++--
bundles/pubsub/pubsub_spi/include/pubsub_admin.h | 4 ++--
libs/utils/CMakeLists.txt | 4 ++++
4 files changed, 10 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/celix/blob/07a491b7/bundles/pubsub/pubsub_admin_udp_mc/src/psa_activator.c
----------------------------------------------------------------------
diff --git a/bundles/pubsub/pubsub_admin_udp_mc/src/psa_activator.c b/bundles/pubsub/pubsub_admin_udp_mc/src/psa_activator.c
index ebe39db..a2b2d0c 100644
--- a/bundles/pubsub/pubsub_admin_udp_mc/src/psa_activator.c
+++ b/bundles/pubsub/pubsub_admin_udp_mc/src/psa_activator.c
@@ -74,8 +74,8 @@ int psa_udpmc_start(psa_udpmc_activator_t *act, celix_bundle_context_t *ctx) {
psaSvc->matchEndpoint = pubsub_udpmcAdmin_matchEndpoint;
psaSvc->setupTopicSender = pubsub_udpmcAdmin_setupTopicSender;
psaSvc->teardownTopicSender = pubsub_udpmcAdmin_teardownTopicSender;
- psaSvc->setupTopicReciever = pubsub_udpmcAdmin_setupTopicReceiver;
- psaSvc->teardownTopicReciever = pubsub_udpmcAdmin_teardownTopicReceiver;
+ psaSvc->setupTopicReceover = pubsub_udpmcAdmin_setupTopicReceiver;
+ psaSvc->teardownTopicReceiver = pubsub_udpmcAdmin_teardownTopicReceiver;
psaSvc->addEndpoint = pubsub_udpmcAdmin_addEndpoint;
psaSvc->removeEndpoint = pubsub_udpmcAdmin_removeEndpoint;
http://git-wip-us.apache.org/repos/asf/celix/blob/07a491b7/bundles/pubsub/pubsub_admin_zmq/src/psa_activator.c
----------------------------------------------------------------------
diff --git a/bundles/pubsub/pubsub_admin_zmq/src/psa_activator.c b/bundles/pubsub/pubsub_admin_zmq/src/psa_activator.c
index 353c33e..01547cc 100644
--- a/bundles/pubsub/pubsub_admin_zmq/src/psa_activator.c
+++ b/bundles/pubsub/pubsub_admin_zmq/src/psa_activator.c
@@ -73,8 +73,8 @@ int psa_zmq_start(psa_zmq_activator_t *act, celix_bundle_context_t *ctx) {
psaSvc->matchEndpoint = pubsub_zmqAdmin_matchEndpoint;
psaSvc->setupTopicSender = pubsub_zmqAdmin_setupTopicSender;
psaSvc->teardownTopicSender = pubsub_zmqAdmin_teardownTopicSender;
- psaSvc->setupTopicReciever = pubsub_zmqAdmin_setupTopicReceiver;
- psaSvc->teardownTopicReciever = pubsub_zmqAdmin_teardownTopicReceiver;
+ psaSvc->setupTopicReceiver = pubsub_zmqAdmin_setupTopicReceiver;
+ psaSvc->teardownTopicReceiver = pubsub_zmqAdmin_teardownTopicReceiver;
psaSvc->addEndpoint = pubsub_zmqAdmin_addEndpoint;
psaSvc->removeEndpoint = pubsub_zmqAdmin_removeEndpoint;
http://git-wip-us.apache.org/repos/asf/celix/blob/07a491b7/bundles/pubsub/pubsub_spi/include/pubsub_admin.h
----------------------------------------------------------------------
diff --git a/bundles/pubsub/pubsub_spi/include/pubsub_admin.h b/bundles/pubsub/pubsub_spi/include/pubsub_admin.h
index 9157861..7f1cc73 100644
--- a/bundles/pubsub/pubsub_spi/include/pubsub_admin.h
+++ b/bundles/pubsub/pubsub_spi/include/pubsub_admin.h
@@ -53,8 +53,8 @@ struct pubsub_admin_service {
celix_status_t (*teardownTopicSender)(void *handle, const char *scope, const char *topic);
//note endpoint is owned by caller
- celix_status_t (*setupTopicReciever)(void *handle, const char *scope, const char *topic, long serializerSvcId, celix_properties_t **subscriberEndpoint);
- celix_status_t (*teardownTopicReciever)(void *handle, const char *scope, const char *topic);
+ celix_status_t (*setupTopicReceiver)(void *handle, const char *scope, const char *topic, long serializerSvcId, celix_properties_t **subscriberEndpoint);
+ celix_status_t (*teardownTopicReceiver)(void *handle, const char *scope, const char *topic);
celix_status_t (*addEndpoint)(void *handle, const celix_properties_t *endpoint);
celix_status_t (*removeEndpoint)(void *handle, const celix_properties_t *endpoint);
http://git-wip-us.apache.org/repos/asf/celix/blob/07a491b7/libs/utils/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/libs/utils/CMakeLists.txt b/libs/utils/CMakeLists.txt
index 7433446..5f211bf 100644
--- a/libs/utils/CMakeLists.txt
+++ b/libs/utils/CMakeLists.txt
@@ -43,6 +43,10 @@ if (ANDROID)
target_compile_definitions(utils PRIVATE -DUSE_FILE32API)
endif ()
+if (NOT APPLE)
+ target_link_libraries(utils PUBLIC -lrt)
+endif ()
+
target_include_directories(utils PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>
$<BUILD_INTERFACE:${MEMSTREAM_INCLUDE_DIR}>