Fix compile errors/warnings in older arduino cores.

Author: h2zero

src/nimble/nimble/host/mesh/src/cdb.c

@@ -4,6 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include "nimble/porting/nimble/include/syscfg/syscfg.h"
+#if MYNEWT_VAL(BLE_MESH)
+
 #define BT_DBG_ENABLED MYNEWT_VAL(BLE_MESH_DEBUG_CDB)
 #define LOG_MODULE_NAME bt_mesh_cdb
 #include "nimble/porting/nimble/include/log/log.h"
@@ -386,3 +389,5 @@ void bt_mesh_cdb_app_key_store(const struct bt_mesh_cdb_app_key *key)
 	}
 }
 #endif
+
+#endif // MYNEWT_VAL(BLE_MESH)

src/nimble/nimble/host/src/ble_hs_hci_cmd.c

@@ -28,7 +28,11 @@
 #include "ble_hs_priv.h"
 #include "ble_monitor_priv.h"
 #ifdef ESP_PLATFORM
-#include "soc/soc_caps.h"
+#  if defined __has_include
+#    if __has_include ("soc/soc_caps.h")
+#      include "soc/soc_caps.h"
+#    endif
+#  endif
 #endif
 
 static int

src/nimble/nimble/host/src/ble_hs_hci_evt.c

@@ -435,6 +435,8 @@ ble_hs_hci_evt_le_conn_complete(uint8_t subevent, const void *data,
 }
 #endif
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wpointer-arith"
 static int
 ble_hs_hci_evt_le_adv_rpt_first_pass(const void *data, unsigned int len)
 {
@@ -517,6 +519,7 @@ ble_hs_hci_evt_le_adv_rpt(uint8_t subevent, const void *data, unsigned int len)
 
     return 0;
 }
+#pragma GCC diagnostic pop
 
 static int
 ble_hs_hci_evt_le_dir_adv_rpt(uint8_t subevent, const void *data, unsigned int len)

src/nimble/nimble/host/src/ble_uuid.c

@@ -228,6 +228,8 @@ ble_uuid_to_mbuf(const ble_uuid_t *uuid, struct os_mbuf *om)
     return 0;
 }
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wpointer-arith"
 int
 ble_uuid_flat(const ble_uuid_t *uuid, void *dst)
 {
@@ -250,6 +252,7 @@ ble_uuid_flat(const ble_uuid_t *uuid, void *dst)
 
     return 0;
 }
+#pragma GCC diagnostic pop
 
 int
 ble_uuid_length(const ble_uuid_t *uuid)

src/nimble/porting/nimble/src/nimble_port.c

@@ -30,7 +30,11 @@
 
 #ifdef ESP_PLATFORM
 #include "esp_log.h"
-#include "soc/soc_caps.h"
+#  if defined __has_include
+#    if __has_include ("soc/soc_caps.h")
+#      include "soc/soc_caps.h"
+#    endif
+#  endif
 #endif
 
 #if SOC_ESP_NIMBLE_CONTROLLER

src/nimble/porting/nimble/src/os_mbuf.c

@@ -381,6 +381,8 @@ os_mbuf_len(const struct os_mbuf *om)
     return len;
 }
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wpointer-arith"
 int
 os_mbuf_append(struct os_mbuf *om, const void *data,  uint16_t len)
 {
@@ -454,6 +456,7 @@ os_mbuf_append(struct os_mbuf *om, const void *data,  uint16_t len)
 err:
     return (rc);
 }
+#pragma GCC diagnostic pop
 
 int
 os_mbuf_appendfrom(struct os_mbuf *dst, const struct os_mbuf *src,
@@ -663,6 +666,9 @@ os_mbuf_adj(struct os_mbuf *mp, int req_len)
     }
 }
 
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wpointer-arith"
 int
 os_mbuf_cmpf(const struct os_mbuf *om, int off, const void *data, int len)
 {
@@ -703,6 +709,7 @@ os_mbuf_cmpf(const struct os_mbuf *om, int off, const void *data, int len)
         }
     }
 }
+#pragma GCC diagnostic pop
 
 int
 os_mbuf_cmpm(const struct os_mbuf *om1, uint16_t offset1,

src/nimble/porting/npl/freertos/src/npl_os_freertos.c

@@ -1309,7 +1309,9 @@ void npl_freertos_funcs_deinit(void)
 #include "freertos/portable.h"
 #include "esp_log.h"
 portMUX_TYPE ble_port_mutex = portMUX_INITIALIZER_UNLOCKED;
+#  if CONFIG_BT_NIMBLE_USE_ESP_TIMER
 static const char *TAG = "Timer";
+#  endif
 
 #else
 #include "nrf.h"