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 2019/02/01 11:07:55 UTC
[celix] branch feature/CELIX-459-pubsub-hums updated: CELIX-459:
Adds define for UUID_STR_LEN if that is not already defined
This is an automated email from the ASF dual-hosted git repository.
pnoltes pushed a commit to branch feature/CELIX-459-pubsub-hums
in repository https://gitbox.apache.org/repos/asf/celix.git
The following commit(s) were added to refs/heads/feature/CELIX-459-pubsub-hums by this push:
new 86bf3e4 CELIX-459: Adds define for UUID_STR_LEN if that is not already defined
86bf3e4 is described below
commit 86bf3e4b5198a32aaa269122f3281cffff331834
Author: Pepijn Noltes <pe...@gmail.com>
AuthorDate: Fri Feb 1 12:07:30 2019 +0100
CELIX-459: Adds define for UUID_STR_LEN if that is not already defined
---
bundles/pubsub/pubsub_admin_zmq/src/pubsub_zmq_topic_receiver.c | 4 ++++
bundles/pubsub/pubsub_topology_manager/src/pubsub_topology_manager.c | 4 ++++
2 files changed, 8 insertions(+)
diff --git a/bundles/pubsub/pubsub_admin_zmq/src/pubsub_zmq_topic_receiver.c b/bundles/pubsub/pubsub_admin_zmq/src/pubsub_zmq_topic_receiver.c
index 13ae1a1..3790bdb 100644
--- a/bundles/pubsub/pubsub_admin_zmq/src/pubsub_zmq_topic_receiver.c
+++ b/bundles/pubsub/pubsub_admin_zmq/src/pubsub_zmq_topic_receiver.c
@@ -37,6 +37,10 @@
#define PSA_ZMQ_RECV_TIMEOUT 1000
+#ifndef UUID_STR_LEN
+#define UUID_STR_LEN 37
+#endif
+
#define L_DEBUG(...) \
logHelper_log(receiver->logHelper, OSGI_LOGSERVICE_DEBUG, __VA_ARGS__)
diff --git a/bundles/pubsub/pubsub_topology_manager/src/pubsub_topology_manager.c b/bundles/pubsub/pubsub_topology_manager/src/pubsub_topology_manager.c
index 1f1da9c..abc8687 100644
--- a/bundles/pubsub/pubsub_topology_manager/src/pubsub_topology_manager.c
+++ b/bundles/pubsub/pubsub_topology_manager/src/pubsub_topology_manager.c
@@ -42,6 +42,10 @@
#define PSTM_PSA_HANDLING_SLEEPTIME_IN_SECONDS 30L
+#ifndef UUID_STR_LEN
+#define UUID_STR_LEN 37
+#endif
+
static void *pstm_psaHandlingThread(void *data);
celix_status_t pubsub_topologyManager_create(bundle_context_pt context, log_helper_pt logHelper, pubsub_topology_manager_t **out) {