[GitHub] andrzej-kaczmarek closed pull request #62: nimble/host: Some fixes for #includes

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

andrzej-kaczmarek closed pull request #62: nimble/host: Some fixes for #includes
URL: https://github.com/apache/mynewt-nimble/pull/62
 
 
   

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/services/bleuart/src/bleuart.c b/nimble/host/services/bleuart/src/bleuart.c
index d481a864..15856352 100644
--- a/nimble/host/services/bleuart/src/bleuart.c
+++ b/nimble/host/services/bleuart/src/bleuart.c
@@ -20,6 +20,7 @@
 #include <assert.h>
 #include <stdio.h>
 #include <string.h>
+#include <stdlib.h>
 
 #include "sysinit/sysinit.h"
 #include "host/ble_hs.h"
diff --git a/nimble/host/src/ble_att_priv.h b/nimble/host/src/ble_att_priv.h
index 8ab15b10..03bbb1bc 100644
--- a/nimble/host/src/ble_att_priv.h
+++ b/nimble/host/src/ble_att_priv.h
@@ -22,6 +22,7 @@
 
 #include <inttypes.h>
 #include "stats/stats.h"
+#include "os/os_time.h"
 #include "os/queue.h"
 #include "host/ble_att.h"
 #include "host/ble_uuid.h"
diff --git a/nimble/host/src/ble_att_svr.c b/nimble/host/src/ble_att_svr.c
index e2d2c9a8..a08b8848 100644
--- a/nimble/host/src/ble_att_svr.c
+++ b/nimble/host/src/ble_att_svr.c
@@ -17,6 +17,7 @@
  * under the License.
  */
 
+#include <stdlib.h>
 #include <string.h>
 #include <errno.h>
 #include "os/os.h"
diff --git a/nimble/host/src/ble_gap.c b/nimble/host/src/ble_gap.c
index cbc7fb81..bca8ac2b 100644
--- a/nimble/host/src/ble_gap.c
+++ b/nimble/host/src/ble_gap.c
@@ -20,13 +20,18 @@
 #include <assert.h>
 #include <string.h>
 #include <errno.h>
-#include "bsp/bsp.h"
 #include "os/os.h"
 #include "nimble/nimble_opt.h"
 #include "host/ble_hs_adv.h"
 #include "host/ble_hs_hci.h"
 #include "ble_hs_priv.h"
 
+#if MYNEWT
+#include "bsp/bsp.h"
+#else
+#define bssnz_t
+#endif
+
 /**
  * GAP - Generic Access Profile.
  *
diff --git a/nimble/host/src/ble_gatts.c b/nimble/host/src/ble_gatts.c
index 9829a7e2..fa1921e2 100644
--- a/nimble/host/src/ble_gatts.c
+++ b/nimble/host/src/ble_gatts.c
@@ -18,8 +18,8 @@
  */
 
 #include <stddef.h>
+#include <stdlib.h>
 #include <string.h>
-#include "console/console.h"
 #include "nimble/ble.h"
 #include "host/ble_uuid.h"
 #include "host/ble_store.h"
diff --git a/nimble/host/src/ble_hs.c b/nimble/host/src/ble_hs.c
index 306a7be8..28705dbe 100644
--- a/nimble/host/src/ble_hs.c
+++ b/nimble/host/src/ble_hs.c
@@ -24,7 +24,6 @@
 #include "syscfg/syscfg.h"
 #include "stats/stats.h"
 #include "os/os.h"
-#include "console/console.h"
 #include "nimble/ble_hci_trans.h"
 #include "ble_hs_priv.h"
 #include "ble_monitor_priv.h"
diff --git a/nimble/host/src/ble_hs_dbg.c b/nimble/host/src/ble_hs_dbg.c
index 646f66ff..e30d0cd2 100644
--- a/nimble/host/src/ble_hs_dbg.c
+++ b/nimble/host/src/ble_hs_dbg.c
@@ -21,7 +21,6 @@
 #include <assert.h>
 #include <string.h>
 #include "os/os.h"
-#include "console/console.h"
 #include "nimble/hci_common.h"
 #include "nimble/ble_hci_trans.h"
 #include "host/ble_monitor.h"
diff --git a/nimble/host/src/ble_hs_hci_cmd.c b/nimble/host/src/ble_hs_hci_cmd.c
index 9d9b5f44..c68479f4 100644
--- a/nimble/host/src/ble_hs_hci_cmd.c
+++ b/nimble/host/src/ble_hs_hci_cmd.c
@@ -22,7 +22,6 @@
 #include <errno.h>
 #include <stdio.h>
 #include "os/os.h"
-#include "console/console.h"
 #include "nimble/hci_common.h"
 #include "nimble/ble_hci_trans.h"
 #include "host/ble_monitor.h"
diff --git a/nimble/host/src/ble_hs_hci_evt.c b/nimble/host/src/ble_hs_hci_evt.c
index 989bc3d2..b2235510 100644
--- a/nimble/host/src/ble_hs_hci_evt.c
+++ b/nimble/host/src/ble_hs_hci_evt.c
@@ -21,7 +21,6 @@
 #include <errno.h>
 #include <stdio.h>
 #include "os/os.h"
-#include "console/console.h"
 #include "nimble/hci_common.h"
 #include "nimble/ble_hci_trans.h"
 #include "host/ble_gap.h"
diff --git a/nimble/host/src/ble_hs_misc.c b/nimble/host/src/ble_hs_misc.c
index 8ec57ed0..f164f6af 100644
--- a/nimble/host/src/ble_hs_misc.c
+++ b/nimble/host/src/ble_hs_misc.c
@@ -20,7 +20,6 @@
 #include <assert.h>
 #include <stdlib.h>
 #include "os/os.h"
-#include "console/console.h"
 #include "ble_hs_priv.h"
 
 const uint8_t ble_hs_misc_null_addr[6];
diff --git a/nimble/host/src/ble_hs_priv.h b/nimble/host/src/ble_hs_priv.h
index d855ccd8..ca74f6cd 100644
--- a/nimble/host/src/ble_hs_priv.h
+++ b/nimble/host/src/ble_hs_priv.h
@@ -22,7 +22,6 @@
 
 #include <assert.h>
 #include <inttypes.h>
-#include "os/os_time.h"
 #include "ble_att_cmd_priv.h"
 #include "ble_att_priv.h"
 #include "ble_gap_priv.h"
diff --git a/nimble/host/src/ble_l2cap_coc.c b/nimble/host/src/ble_l2cap_coc.c
index 537e1e04..22c508f5 100644
--- a/nimble/host/src/ble_l2cap_coc.c
+++ b/nimble/host/src/ble_l2cap_coc.c
@@ -19,7 +19,6 @@
 
 #include <string.h>
 #include <errno.h>
-#include "console/console.h"
 #include "nimble/ble.h"
 #include "ble_hs_priv.h"
 #include "ble_l2cap_priv.h"
diff --git a/nimble/host/src/ble_l2cap_sig.c b/nimble/host/src/ble_l2cap_sig.c
index c9e6bcd3..c852d243 100644
--- a/nimble/host/src/ble_l2cap_sig.c
+++ b/nimble/host/src/ble_l2cap_sig.c
@@ -44,7 +44,6 @@
 
 #include <string.h>
 #include <errno.h>
-#include "console/console.h"
 #include "nimble/ble.h"
 #include "host/ble_monitor.h"
 #include "ble_hs_priv.h"
diff --git a/nimble/host/src/ble_sm.c b/nimble/host/src/ble_sm.c
index e53b4ff1..24491a96 100644
--- a/nimble/host/src/ble_sm.c
+++ b/nimble/host/src/ble_sm.c
@@ -43,7 +43,6 @@
 
 #include <string.h>
 #include <errno.h>
-#include "console/console.h"
 #include "nimble/ble.h"
 #include "nimble/nimble_opt.h"
 #include "host/ble_sm.h"
diff --git a/nimble/host/src/ble_sm_cmd.c b/nimble/host/src/ble_sm_cmd.c
index 1503652a..b5e674e7 100644
--- a/nimble/host/src/ble_sm_cmd.c
+++ b/nimble/host/src/ble_sm_cmd.c
@@ -19,7 +19,6 @@
 
 #include <string.h>
 #include <errno.h>
-#include "console/console.h"
 #include "nimble/ble.h"
 #include "nimble/nimble_opt.h"
 #include "host/ble_sm.h"
diff --git a/nimble/host/src/ble_sm_lgcy.c b/nimble/host/src/ble_sm_lgcy.c
index ff53b1e6..bb2d66d5 100644
--- a/nimble/host/src/ble_sm_lgcy.c
+++ b/nimble/host/src/ble_sm_lgcy.c
@@ -19,7 +19,6 @@
 
 #include <string.h>
 #include <errno.h>
-#include "console/console.h"
 #include "nimble/ble.h"
 #include "nimble/nimble_opt.h"
 #include "host/ble_sm.h"


 

----------------------------------------------------------------
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