[GitHub] andrzej-kaczmarek closed pull request #112: porting: Fixes for compilation errors

[GitBox <gi...@apache.org>]

andrzej-kaczmarek closed pull request #112: porting: Fixes for compilation errors
URL: https://github.com/apache/mynewt-nimble/pull/112
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/nimble/host/mesh/src/glue.c b/nimble/host/mesh/src/glue.c
index d952c6b6..f791df78 100644
--- a/nimble/host/mesh/src/glue.c
+++ b/nimble/host/mesh/src/glue.c
@@ -19,6 +19,9 @@
 
 #include "mesh/glue.h"
 #include "adv.h"
+#ifndef MYNEWT
+#include "nimble/nimble_port.h"
+#endif
 
 #define BT_DBG_ENABLED (MYNEWT_VAL(BLE_MESH_DEBUG))
 
@@ -342,13 +345,21 @@ net_buf_reserve(struct os_mbuf *om, size_t reserve)
 void
 k_work_init(struct ble_npl_callout *work, ble_npl_event_fn handler)
 {
+#ifndef MYNEWT
+    ble_npl_callout_init(work, nimble_port_get_dflt_eventq(), handler, NULL);
+#else
     ble_npl_callout_init(work, ble_npl_eventq_dflt_get(), handler, NULL);
+#endif
 }
 
 void
 k_delayed_work_init(struct k_delayed_work *w, ble_npl_event_fn *f)
 {
+#ifndef MYNEWT
+    ble_npl_callout_init(&w->work, nimble_port_get_dflt_eventq(), f, NULL);
+#else
     ble_npl_callout_init(&w->work, ble_npl_eventq_dflt_get(), f, NULL);
+#endif
 }
 
 void


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services