You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by ma...@apache.org on 2016/10/03 20:28:57 UTC

[4/6] incubator-mynewt-core git commit: Add #ifdef __cplusplus guards

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/bootloader_dfu/dfu_ble_svc.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/bootloader_dfu/dfu_ble_svc.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/bootloader_dfu/dfu_ble_svc.h
index 5e5ae4b..37a6412 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/bootloader_dfu/dfu_ble_svc.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/bootloader_dfu/dfu_ble_svc.h
@@ -40,6 +40,10 @@
 #include "nrf_soc.h"
 #include "nrf_error_sdm.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define BOOTLOADER_SVC_BASE     0x0     /**< The number of the lowest SVC number reserved for the bootloader. */
 #define SYSTEM_SERVICE_ATT_SIZE 8       /**< Size of the system service attribute length including CRC-16 at the end. */  
 
@@ -75,6 +79,10 @@ typedef struct
  */
 SVCALL(DFU_BLE_SVC_PEER_DATA_SET, uint32_t, dfu_ble_svc_peer_data_set(dfu_ble_peer_data_t * p_peer_data));
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // DFU_BLE_SVC_H__
 
 /** @} */

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/bootloader_dfu/dfu_ble_svc_internal.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/bootloader_dfu/dfu_ble_svc_internal.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/bootloader_dfu/dfu_ble_svc_internal.h
index 0b6e5d4..f74eeb2 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/bootloader_dfu/dfu_ble_svc_internal.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/bootloader_dfu/dfu_ble_svc_internal.h
@@ -28,6 +28,10 @@
 #include "dfu_ble_svc.h"
 #include "ble_gap.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**@brief Internal bootloader/DFU function for retrieving peer data provided from application.
  *
  * @param[out] p_peer_data Peer data set by application to be used for DFU connection.
@@ -38,6 +42,10 @@
  */
 uint32_t dfu_ble_peer_data_get(dfu_ble_peer_data_t * p_peer_data);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // DFU_BLE_SVC_INTERNAL_H__
 
 /** @} */

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/bootloader_dfu/dfu_init.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/bootloader_dfu/dfu_init.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/bootloader_dfu/dfu_init.h
index 059ad0d..edac3ce 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/bootloader_dfu/dfu_init.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/bootloader_dfu/dfu_init.h
@@ -44,6 +44,10 @@
 #include <stdint.h>
 #include "nrf.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**@brief Structure contained in an init packet. Contains information on device type, revision, and 
  *        supported SoftDevices.
  */
@@ -129,6 +133,10 @@ uint32_t dfu_init_prevalidate(uint8_t * p_init_data, uint32_t init_data_len);
  */
 uint32_t dfu_init_postvalidate(uint8_t * p_image, uint32_t image_len);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // DFU_INIT_H__
 
 /**@} */

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/bootloader_dfu/dfu_transport.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/bootloader_dfu/dfu_transport.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/bootloader_dfu/dfu_transport.h
index 4587b2a..6eb7ab6 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/bootloader_dfu/dfu_transport.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/bootloader_dfu/dfu_transport.h
@@ -23,6 +23,10 @@
 
 #include <stdint.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**@brief Function for starting the update of Device Firmware.
  *
  * @retval NRF_SUCCESS Operation success.   
@@ -35,6 +39,10 @@ uint32_t dfu_transport_update_start(void);
  */
 uint32_t dfu_transport_close(void);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // DFU_TRANSPORT_H__
 
 /**@} */

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/bootloader_dfu/dfu_types.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/bootloader_dfu/dfu_types.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/bootloader_dfu/dfu_types.h
index f460ed4..1415ee1 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/bootloader_dfu/dfu_types.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/bootloader_dfu/dfu_types.h
@@ -29,6 +29,10 @@
 #include "nrf.h"
 #include "app_util.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define NRF_UICR_BOOT_START_ADDRESS         (NRF_UICR_BASE + 0x14)      /**< Register where the bootloader start address is stored in the UICR register. */
 
 #if defined(NRF52)                                                  
@@ -163,6 +167,10 @@ typedef struct
 /**@brief Update complete handler type. */
 typedef void (*dfu_complete_handler_t)(dfu_update_status_t dfu_update_status);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // DFU_TYPES_H__
 
 /**@} */

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/bootloader_dfu/experimental/nrf_sec.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/bootloader_dfu/experimental/nrf_sec.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/bootloader_dfu/experimental/nrf_sec.h
index c2e2d32..fce0ce9 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/bootloader_dfu/experimental/nrf_sec.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/bootloader_dfu/experimental/nrf_sec.h
@@ -16,6 +16,10 @@
 #include "nrf_svc.h"
 #include <stdint.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define NRF_SEC_SVC_BASE 0x8 /**< The lowest SVC number reserved for the nRF Security library. */
 
 /**@brief The SVC numbers used by the SVC functions in the security library. */
@@ -105,4 +109,8 @@ SVCALL(NRF_SEC_SVC_HASH, uint32_t, nrf_sec_svc_hash(nrf_sec_data_t      * p_data
                                                     uint8_t             * p_digest, 
                                                     nrf_sec_hash_func_t   hash_func));
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // NRF_SEC_H__

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/bootloader_dfu/hci_transport/hci_mem_pool_internal.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/bootloader_dfu/hci_transport/hci_mem_pool_internal.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/bootloader_dfu/hci_transport/hci_mem_pool_internal.h
index fdfd3fe..596f1b9 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/bootloader_dfu/hci_transport/hci_mem_pool_internal.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/bootloader_dfu/hci_transport/hci_mem_pool_internal.h
@@ -22,11 +22,19 @@
 #ifndef MEM_POOL_INTERNAL_H__
 #define MEM_POOL_INTERNAL_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define TX_BUF_SIZE       32u    /**< TX buffer size in bytes. */
 #define RX_BUF_SIZE       600u   /**< RX buffer size in bytes. */
 
 #define RX_BUF_QUEUE_SIZE 2u     /**< RX buffer element size. */
  
+#ifdef __cplusplus
+}
+#endif
+
 #endif // MEM_POOL_INTERNAL_H__
  
 /** @} */

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/bootloader_dfu/hci_transport/hci_transport_config.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/bootloader_dfu/hci_transport/hci_transport_config.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/bootloader_dfu/hci_transport/hci_transport_config.h
index aa6dfc3..5befce3 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/bootloader_dfu/hci_transport/hci_transport_config.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/bootloader_dfu/hci_transport/hci_transport_config.h
@@ -23,6 +23,10 @@
 
 #include "boards.h"                                                     /**< Default include for boards.h which means that default pin numbers will be used for RX, TX, CTS, and RTS on the UART. Other pin number can be used if desired. */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /** This section covers configurable parameters for the HCI Transport SLIP layer. */
 #define HCI_SLIP_UART_RX_PIN_NUMBER  RX_PIN_NUMBER                      /**< Defines the UART RX pin number. The default pin for the board is chosen, but can be overwritten. */
 
@@ -40,6 +44,10 @@
 #define MAX_PACKET_SIZE_IN_BITS      8000u                              /**< Maximum size of a single application packet in bits. */      
 #define USED_BAUD_RATE               38400u                             /**< The used uart baudrate. */
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // HCI_TRANSPORT_CONFIG_H__
 
 /** @} */

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/button/app_button.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/button/app_button.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/button/app_button.h
index 5d18823..a7b9697 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/button/app_button.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/button/app_button.h
@@ -42,6 +42,10 @@
 #include "app_error.h"
 #include "nrf_gpio.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define APP_BUTTON_PUSH        1                               /**< Indicates that a button is pushed. */
 #define APP_BUTTON_RELEASE     0                               /**< Indicates that a button is released. */
 #define APP_BUTTON_ACTIVE_HIGH 1                               /**< Indicates that a button is active high. */
@@ -107,6 +111,10 @@ uint32_t app_button_disable(void);
  */
 uint32_t app_button_is_pushed(uint8_t button_id, bool * p_is_pushed);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // APP_BUTTON_H__
 
 /** @} */

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/crc16/crc16.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/crc16/crc16.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/crc16/crc16.h
index 63defad..e5bbe26 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/crc16/crc16.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/crc16/crc16.h
@@ -25,6 +25,10 @@
 
 #include <stdint.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**@brief Function for calculating CRC-16 in blocks.
  *
  * Feed each consecutive data block into this function, along with the current value of p_crc as
@@ -39,6 +43,10 @@
  */
 uint16_t crc16_compute(uint8_t const * p_data, uint32_t size, uint16_t const * p_crc);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // CRC16_H__
  
 /** @} */

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/crc32/crc32.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/crc32/crc32.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/crc32/crc32.h
index 801eb0b..4ec4e88 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/crc32/crc32.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/crc32/crc32.h
@@ -24,6 +24,10 @@
 
 #include <stdint.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**@brief Function for calculating CRC-32 in blocks.
  *
  * Feed each consecutive data block into this function, along with the current value of p_crc as
@@ -38,6 +42,10 @@
  */
 uint32_t crc32_compute(uint8_t const * p_data, uint32_t size, uint32_t const * p_crc);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // CRC32_H__
  
 /** @} */

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/experimental_section_vars/section_vars.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/experimental_section_vars/section_vars.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/experimental_section_vars/section_vars.h
index 7a78b60..ac96a67 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/experimental_section_vars/section_vars.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/experimental_section_vars/section_vars.h
@@ -14,6 +14,10 @@
 #define SECTION_VARS_H__
 
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @defgroup section_vars Section variables
  * @ingroup app_common
@@ -260,4 +264,8 @@
 
 /** @} */
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // SECTION_VARS_H__

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/fds/config/fds_config.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/fds/config/fds_config.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/fds/config/fds_config.h
index 32e762f..b158f36 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/fds/config/fds_config.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/fds/config/fds_config.h
@@ -13,6 +13,10 @@
 #ifndef FDS_CONFIG_H__
 #define FDS_CONFIG_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
  /**
  * @file fds_config.h
  *
@@ -60,4 +64,8 @@
 
 /** @} */
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // FDS_CONFIG_H__

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/fds/fds.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/fds/fds.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/fds/fds.h
index dc37df3..1fe54ec 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/fds/fds.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/fds/fds.h
@@ -13,6 +13,10 @@
 #ifndef FDS_H__
 #define FDS_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @defgroup flash_data_storage Flash Data Storage
  * @ingroup app_common
@@ -730,4 +734,8 @@ ret_code_t fds_verify_crc_on_writes(bool enabled);
 
 /** @} */
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // FDS_H__

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/fds/fds_internal_defs.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/fds/fds_internal_defs.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/fds/fds_internal_defs.h
index 4c2d165..7dd31ea 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/fds/fds_internal_defs.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/fds/fds_internal_defs.h
@@ -17,6 +17,10 @@
 #include <stdbool.h>
 #include "fds_config.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #if defined (FDS_THREADS)
     #include "nrf_soc.h"
     #include "app_util_platform.h"
@@ -302,4 +306,8 @@ typedef struct
 #endif
 
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // FDS_INTERNAL_DEFS_H__

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/fifo/app_fifo.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/fifo/app_fifo.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/fifo/app_fifo.h
index 300adca..2011cab 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/fifo/app_fifo.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/fifo/app_fifo.h
@@ -25,6 +25,10 @@
 #include <stdint.h>
 #include <stdlib.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**@brief   A FIFO instance structure.
  * @details Keeps track of which bytes to read and write next.
  *          Also, it keeps the information about which memory is allocated for the buffer
@@ -140,6 +144,10 @@ uint32_t app_fifo_read(app_fifo_t * p_fifo, uint8_t * p_byte_array, uint32_t * p
  */
 uint32_t app_fifo_write(app_fifo_t * p_fifo, uint8_t const * p_byte_array, uint32_t * p_size);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // APP_FIFO_H__
 
 /** @} */

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/fstorage/config/fstorage_config.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/fstorage/config/fstorage_config.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/fstorage/config/fstorage_config.h
index 1423c01..c552142 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/fstorage/config/fstorage_config.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/fstorage/config/fstorage_config.h
@@ -13,6 +13,10 @@
 #ifndef FS_CONFIG_H__
 #define FS_CONFIG_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @defgroup fstorage_config fstorage configuration
  * @ingroup fstorage
@@ -55,5 +59,9 @@
 
 /** @} */
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // FS_CONFIG_H__
 

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/fstorage/fstorage.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/fstorage/fstorage.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/fstorage/fstorage.h
index 7e2044b..a078cb8 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/fstorage/fstorage.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/fstorage/fstorage.h
@@ -13,6 +13,10 @@
 #ifndef FSTORAGE_H__
 #define FSTORAGE_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @defgroup fstorage fstorage
  * @ingroup app_common
@@ -232,4 +236,8 @@ void fs_sys_event_handler(uint32_t sys_evt);
 
 /** @} */
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // FSTORAGE_H__

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/fstorage/fstorage_internal_defs.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/fstorage/fstorage_internal_defs.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/fstorage/fstorage_internal_defs.h
index 5498c02..148efdf 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/fstorage/fstorage_internal_defs.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/fstorage/fstorage_internal_defs.h
@@ -16,6 +16,10 @@
 #include "nrf.h"
 
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define FS_FLAG_INITIALIZED         (1 << 0)  // The module has been initialized.
 #define FS_FLAG_PROCESSING          (1 << 1)  // The module is processing flash operations.
 // The module is waiting for a flash operation initiated by another module to complete.
@@ -132,4 +136,8 @@ static uint32_t const * fs_flash_page_end_addr()
 #define FS_PAGE_END_ADDR    (fs_flash_page_end_addr())
 
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif //__FSTORAGE_INTERNAL_DEFS_H

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/gpiote/app_gpiote.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/gpiote/app_gpiote.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/gpiote/app_gpiote.h
index e651e80..b67da2a 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/gpiote/app_gpiote.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/gpiote/app_gpiote.h
@@ -46,6 +46,10 @@
 #include "app_error.h"
 #include "app_util.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define GPIOTE_USER_NODE_SIZE   24          /**< Size of app_gpiote.gpiote_user_t (only for use inside APP_GPIOTE_BUF_SIZE()). */
 #define NO_OF_PINS              32          /**< Number of GPIO pins on the \nRFXX chip. */
 
@@ -214,6 +218,10 @@ uint32_t app_gpiote_enable_interrupts(void);
 uint32_t app_gpiote_disable_interrupts(void);
 
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // APP_GPIOTE_H__
 
 /** @} */

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/hardfault/hardfault.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/hardfault/hardfault.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/hardfault/hardfault.h
index 3cb099a..98704d1 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/hardfault/hardfault.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/hardfault/hardfault.h
@@ -13,6 +13,10 @@
 #define HARFAULT_H__
 #include <stdint.h>
 #include <stddef.h>
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @defgroup hardfault_default HardFault exception
  * @{
@@ -56,5 +60,9 @@ typedef struct HardFault_stack
 void HardFault_process(HardFault_stack_t *p_stack);
 
 /** @} */
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* HARFAULT_H__ */
 

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/hci/config/hci_mem_pool_internal.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/hci/config/hci_mem_pool_internal.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/hci/config/hci_mem_pool_internal.h
index 2027710..90e968f 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/hci/config/hci_mem_pool_internal.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/hci/config/hci_mem_pool_internal.h
@@ -22,11 +22,19 @@
 #ifndef MEM_POOL_INTERNAL_H__
 #define MEM_POOL_INTERNAL_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define TX_BUF_SIZE       600u         /**< TX buffer size in bytes. */
 #define RX_BUF_SIZE       TX_BUF_SIZE  /**< RX buffer size in bytes. */
 
 #define RX_BUF_QUEUE_SIZE 4u           /**< RX buffer element size. */
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // MEM_POOL_INTERNAL_H__
  
 /** @} */

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/hci/config/hci_transport_config.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/hci/config/hci_transport_config.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/hci/config/hci_transport_config.h
index 7684615..0773118 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/hci/config/hci_transport_config.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/hci/config/hci_transport_config.h
@@ -18,6 +18,10 @@
 #ifndef HCI_TRANSPORT_CFG_H__
 #define HCI_TRANSPORT_CFG_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /** This section covers configurable parameters for the HCI Transport SLIP layer. */
 #define HCI_SLIP_UART_RX_PIN_NUMBER  1                      /**< Defines the UART RX pin number. The default pin for the board is chosen, but can be overwritten. */
 
@@ -35,6 +39,10 @@
 #define MAX_PACKET_SIZE_IN_BITS      8000u                              /**< Maximum size of a single application packet in bits. */      
 #define USED_BAUD_RATE               38400u                             /**< The used uart baudrate. */
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // HCI_TRANSPORT_CFG_H__
 
 /** @} */

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/hci/hci_mem_pool.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/hci/hci_mem_pool.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/hci/hci_mem_pool.h
index 502265e..2516631 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/hci/hci_mem_pool.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/hci/hci_mem_pool.h
@@ -48,6 +48,10 @@
 #include <stdint.h>
 #include "nrf_error.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**@brief Function for opening the module.
  *
  * @retval NRF_SUCCESS          Operation success. 
@@ -127,6 +131,10 @@ uint32_t hci_mem_pool_rx_extract(uint8_t ** pp_buffer, uint32_t * p_length);
  */
 uint32_t hci_mem_pool_rx_consume(uint8_t * p_buffer);
  
+#ifdef __cplusplus
+}
+#endif
+
 #endif // HCI_MEM_POOL_H__
  
 /** @} */

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/hci/hci_slip.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/hci/hci_slip.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/hci/hci_slip.h
index cc3b415..43c72ea 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/hci/hci_slip.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/hci/hci_slip.h
@@ -33,6 +33,10 @@
 
 #include <stdint.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**@brief Event types from the SLIP Layer. */
 typedef enum
 {
@@ -124,6 +128,10 @@ uint32_t hci_slip_write(const uint8_t * p_buffer, uint32_t length);
  */
 uint32_t hci_slip_rx_buffer_register(uint8_t * p_buffer, uint32_t length);
  
+#ifdef __cplusplus
+}
+#endif
+
 #endif // HCI_SLIP_H__
  
 /** @} */

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/hci/hci_transport.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/hci/hci_transport.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/hci/hci_transport.h
index 85a4d6a..c09203a 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/hci/hci_transport.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/hci/hci_transport.h
@@ -78,6 +78,10 @@
 #include <stdint.h>
 #include "nrf_error.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**@brief Generic event callback function events. */
 typedef enum
 {
@@ -215,6 +219,10 @@ uint32_t hci_transport_rx_pkt_extract(uint8_t ** pp_buffer, uint16_t * p_length)
  */
 uint32_t hci_transport_rx_pkt_consume(uint8_t * p_buffer);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // HCI_TRANSPORT_H__
 
 /** @} */

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/ic_info/nrf_ic_info.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/ic_info/nrf_ic_info.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/ic_info/nrf_ic_info.h
index 9c01be0..db40097 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/ic_info/nrf_ic_info.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/ic_info/nrf_ic_info.h
@@ -25,6 +25,10 @@
 
 #include <stdint.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**@brief Enum identifying the IC revision as described in the Compatibility Matrix. */
 typedef enum
 {
@@ -52,6 +56,10 @@ typedef struct
 void nrf_ic_info_get(nrf_ic_info_t*  p_ic_info);
 
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // NRF51_IC_INFO_H__
 
 /** @} */

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/led_softblink/led_softblink.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/led_softblink/led_softblink.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/led_softblink/led_softblink.h
index 33f62b4..4aa976b 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/led_softblink/led_softblink.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/led_softblink/led_softblink.h
@@ -32,6 +32,10 @@
 #include <stdint.h>
 #include "sdk_errors.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @brief Structure holding the initialization parameters.
  */
@@ -125,6 +129,10 @@ void led_softblink_on_time_set(uint32_t on_time_ticks);
  * @retval NRF_SUCCESS          If LED softblink was uninitialized successfully.
  */
 ret_code_t led_softblink_uninit(void);
+#ifdef __cplusplus
+}
+#endif
+
 #endif // LED_SOFTBLINK_H__
 
 /** @} */

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/low_power_pwm/low_power_pwm.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/low_power_pwm/low_power_pwm.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/low_power_pwm/low_power_pwm.h
index cf87030..f8175bb 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/low_power_pwm/low_power_pwm.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/low_power_pwm/low_power_pwm.h
@@ -34,6 +34,10 @@
 #include "nrf_drv_common.h"
 #include "sdk_errors.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @brief Event types.
  */
@@ -163,6 +167,10 @@ ret_code_t low_power_pwm_stop(low_power_pwm_t * p_pwm_instance);
  */
 ret_code_t low_power_pwm_duty_set(low_power_pwm_t * p_pwm_instance, uint8_t duty_cycle);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // LOW_POWER_PWM_H__
 
 /** @} */

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/mailbox/app_mailbox.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/mailbox/app_mailbox.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/mailbox/app_mailbox.h
index 1e09b70..e663af4 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/mailbox/app_mailbox.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/mailbox/app_mailbox.h
@@ -28,6 +28,10 @@
 #include "app_util.h"
 #include "nordic_common.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @brief Supported overflow modes.
  */
@@ -139,5 +143,9 @@ uint32_t app_mailbox_length_get (const app_mailbox_t * p_mailbox);
  */
 void app_mailbox_mode_set(const app_mailbox_t * p_mailbox, app_mailbox_overflow_mode_t mode);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif //_APP_MAILBOX_H
 /** @} */

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/mem_manager/mem_manager.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/mem_manager/mem_manager.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/mem_manager/mem_manager.h
index f9218c3..5d009ce 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/mem_manager/mem_manager.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/mem_manager/mem_manager.h
@@ -37,6 +37,10 @@
 #include "sdk_common.h"
 
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**@brief Initializes Memory Manager.
  *
  * @details API to initialize the Memory Manager. Always call this API before using any of the other
@@ -135,5 +139,9 @@ void nrf_mem_diagnose(void);
 
 #endif // MEM_MANAGER_ENABLE_DIAGNOSTICS
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // MEM_MANAGER_H__
 /** @} */

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/pwm/app_pwm.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/pwm/app_pwm.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/pwm/app_pwm.h
index ebeaa64..eb3c1d4 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/pwm/app_pwm.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/pwm/app_pwm.h
@@ -40,6 +40,10 @@
 #include "nrf_drv_ppi.h"
 
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define APP_PWM_NOPIN                 0xFFFFFFFF
 
 /** @brief Number of channels for one timer instance (fixed to 2 due to timer properties).*/
@@ -290,6 +294,10 @@ app_pwm_duty_t app_pwm_channel_duty_get(app_pwm_t const * const p_instance, uint
 /** @} */
 
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
 
 /** @} */

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/scheduler/app_scheduler.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/scheduler/app_scheduler.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/scheduler/app_scheduler.h
index f52e616..40cb562 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/scheduler/app_scheduler.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/scheduler/app_scheduler.h
@@ -54,6 +54,10 @@
 #include "app_error.h"
 #include "app_util.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define APP_SCHED_EVENT_HEADER_SIZE 8       /**< Size of app_scheduler.event_header_t (only for use inside APP_SCHED_BUF_SIZE()). */
 
 /**@brief Compute number of bytes required to hold the scheduler buffer.
@@ -158,6 +162,10 @@ void app_sched_pause(void);
  */
 void app_sched_resume(void);
 #endif
+#ifdef __cplusplus
+}
+#endif
+
 #endif // APP_SCHEDULER_H__
 
 /** @} */

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/sensorsim/sensorsim.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/sensorsim/sensorsim.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/sensorsim/sensorsim.h
index 3aa278d..b018e30 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/sensorsim/sensorsim.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/sensorsim/sensorsim.h
@@ -26,6 +26,10 @@
 #include <stdint.h>
 #include <stdbool.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**@brief Triangular waveform sensor simulator configuration. */
 typedef struct
 {
@@ -80,6 +84,10 @@ void sensorsim_increment(sensorsim_state_t *     p_state,
 void sensorsim_decrement(sensorsim_state_t *     p_state,
                          const sensorsim_cfg_t * p_cfg);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // SENSORSIM_H__
 
 /** @} */

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/sha256/sha256.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/sha256/sha256.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/sha256/sha256.h
index acea32b..ae95fc0 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/sha256/sha256.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/sha256/sha256.h
@@ -38,6 +38,10 @@
 #include "sdk_errors.h"
 
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**@brief Current state of a hash operation.
  */
 typedef struct {
@@ -86,6 +90,10 @@ ret_code_t sha256_update(sha256_context_t *ctx, const uint8_t * data, const size
  */
 ret_code_t sha256_final(sha256_context_t *ctx, uint8_t * hash);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif   // SHA256_H
 
 /** @} */

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/simple_timer/app_simple_timer.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/simple_timer/app_simple_timer.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/simple_timer/app_simple_timer.h
index f72d7ca..9bb6c59 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/simple_timer/app_simple_timer.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/simple_timer/app_simple_timer.h
@@ -29,6 +29,10 @@
 
 #include <stdint.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**@brief Timer time-out handler type. */
 typedef void (*app_simple_timer_timeout_handler_t)(void * p_context);
 
@@ -93,6 +97,10 @@ uint32_t app_simple_timer_stop(void);
  */
 uint32_t app_simple_timer_uninit(void);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // TIMER_H__
 
 /** @} */

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/slip/slip.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/slip/slip.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/slip/slip.h
index 7c63b81..ac8b7f8 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/slip/slip.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/slip/slip.h
@@ -16,6 +16,10 @@
 #include <stdint.h>
 #include "app_fifo.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /** @file
  *
  * @defgroup slip SLIP encoding decoding
@@ -61,6 +65,10 @@ uint32_t slip_encode(uint8_t * p_output,  uint8_t * p_input, uint32_t input_leng
 uint32_t slip_decoding_add_char(uint8_t c, buffer_t * p_buf, slip_state_t * current_state);
 
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // SLIP_H__
 
 /** @} */

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/timer/app_timer.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/timer/app_timer.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/timer/app_timer.h
index ca46b40..37393eb 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/timer/app_timer.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/timer/app_timer.h
@@ -47,6 +47,10 @@
 #include "app_util.h"
 #include "compiler_abstraction.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define APP_TIMER_CLOCK_FREQ         32768                      /**< Clock frequency of the RTC timer used to implement the app timer module. */
 #define APP_TIMER_MIN_TIMEOUT_TICKS  5                          /**< Minimum value of the timeout_ticks parameter of app_timer_start(). */
 
@@ -282,6 +286,10 @@ uint32_t app_timer_cnt_diff_compute(uint32_t   ticks_to,
 uint16_t app_timer_op_queue_utilization_get(void);
 #endif
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // APP_TIMER_H__
 
 /** @} */

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/timer/app_timer_appsh.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/timer/app_timer_appsh.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/timer/app_timer_appsh.h
index f92629b..77a5951 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/timer/app_timer_appsh.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/timer/app_timer_appsh.h
@@ -15,6 +15,10 @@
 
 #include "app_timer.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define APP_TIMER_SCHED_EVT_SIZE     sizeof(app_timer_event_t)  /**< Size of button events being passed through the scheduler (is to be used for computing the maximum size of scheduler events). */
 
 /**@brief Macro for initializing the application timer module to use with app_scheduler.
@@ -40,5 +44,9 @@ typedef struct
 
 uint32_t app_timer_evt_schedule(app_timer_timeout_handler_t timeout_handler,
                                 void *                      p_context);
+#ifdef __cplusplus
+}
+#endif
+
 #endif // APP_TIMER_APPSH_H
  

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/trace/app_trace.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/trace/app_trace.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/trace/app_trace.h
index c746c63..144b15e 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/trace/app_trace.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/trace/app_trace.h
@@ -4,6 +4,10 @@
 #include <stdint.h>
 #include <stdio.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @defgroup app_trace Debug Logger
  * @ingroup app_common
@@ -53,4 +57,8 @@ void app_trace_dump(uint8_t * p_buffer, uint32_t len);
 
 /** @} */
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif //__DEBUG_H_

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/twi/app_twi.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/twi/app_twi.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/twi/app_twi.h
index 1ae2743..65bbf45 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/twi/app_twi.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/twi/app_twi.h
@@ -17,6 +17,10 @@
 #include "nrf_drv_twi.h"
 #include "sdk_errors.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @defgroup app_twi TWI transaction manager
  * @{
@@ -287,4 +291,8 @@ __STATIC_INLINE bool app_twi_is_idle(app_twi_t * p_app_twi)
  *@}
  **/
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // APP_TWI_H__

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/uart/app_uart.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/uart/app_uart.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/uart/app_uart.h
index 8988cc8..aea405c 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/uart/app_uart.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/uart/app_uart.h
@@ -26,6 +26,10 @@
 #include <stdbool.h>
 #include "app_util_platform.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define  UART_PIN_DISCONNECTED 0xFFFFFFFF /**< Value indicating that no pin is connected to this UART register. */
 
 /**@brief UART Flow Control modes for the peripheral.
@@ -222,6 +226,10 @@ uint32_t app_uart_flush(void);
 uint32_t app_uart_close(void);
 
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif //APP_UART_H__
 
 /** @} */

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/util/app_error.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/util/app_error.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/util/app_error.h
index c87a6df..25510c4 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/util/app_error.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/util/app_error.h
@@ -31,6 +31,10 @@
 #include "nrf_log.h"
 #include "app_error_weak.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define NRF_FAULT_ID_SDK_RANGE_START 0x00004000 /**< The start of the range of error IDs defined in the SDK. */
 
 /**@defgroup APP_ERROR_FAULT_IDS Fault ID types
@@ -196,6 +200,10 @@ static __INLINE void app_error_print(uint32_t id, uint32_t pc, uint32_t info)
         }                                                     \
     } while (0)
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // APP_ERROR_H__
 
 /** @} */

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/util/app_error_weak.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/util/app_error_weak.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/util/app_error_weak.h
index 551a431..5607c73 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/util/app_error_weak.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/util/app_error_weak.h
@@ -13,6 +13,10 @@
 #ifndef APP_ERROR_WEAK_H__
 #define APP_ERROR_WEAK_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /** @file
  *
  * @defgroup app_error Common application error handler
@@ -48,4 +52,8 @@ __WEAK void app_error_fault_handler(uint32_t id, uint32_t pc, uint32_t info);
 
 /** @} */
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // APP_ERROR_WEAK_H__

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/util/app_util.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/util/app_util.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/util/app_util.h
index 774bc28..b418f28 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/util/app_util.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/util/app_util.h
@@ -27,6 +27,10 @@
 #include "compiler_abstraction.h"
 #include "nrf.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 //lint -save -e27 -e10 -e19
 #if defined ( __CC_ARM )
 extern char STACK$$Base;
@@ -488,6 +492,10 @@ static __INLINE bool is_address_from_stack(void * ptr)
     }
 }
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // APP_UTIL_H__
 
 /** @} */

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/util/app_util_bds.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/util/app_util_bds.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/util/app_util_bds.h
index 7547ad8..677a8b8 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/util/app_util_bds.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/util/app_util_bds.h
@@ -30,6 +30,10 @@
 #include "ble_srv_common.h"
 #include "nordic_common.h"
     
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 typedef uint8_t nibble_t;
 typedef uint32_t uint24_t;
 typedef uint64_t uint40_t;
@@ -408,6 +412,10 @@ static __INLINE uint8_t bds_ble_date_time_decode(const uint8_t   len,
     return pos;
 }
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // APP_UTIL_BDS_H__
 
 /** @} */

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/util/app_util_platform.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/util/app_util_platform.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/util/app_util_platform.h
index e0142ae..7b25e5b 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/util/app_util_platform.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/util/app_util_platform.h
@@ -25,6 +25,10 @@
 #include <stdint.h>
 #include "compiler_abstraction.h"
 #include "nrf.h"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #ifdef SOFTDEVICE_PRESENT
 #include "nrf_soc.h"
 #include "nrf_nvic.h"
@@ -206,6 +210,10 @@ static __INLINE uint8_t privilege_level_get(void)
 #endif
 }
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // APP_UTIL_PLATFORM_H__
 
 /** @} */

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/util/common.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/util/common.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/util/common.h
index e08d52d..d7dbe62 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/util/common.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/util/common.h
@@ -13,6 +13,10 @@
 #ifndef COMMON_H
 #define COMMON_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /*lint ++flb "Enter library region" */
 
 #include <stdbool.h>
@@ -35,4 +39,8 @@
 #define PINOUT(p)                PINX_GLUE(PIN,p,OUT)  /*!< gpio out pin number 'p' */
 
 /*lint --flb "Leave library region" */
+#ifdef __cplusplus
+}
+#endif
+
 #endif

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/util/nordic_common.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/util/nordic_common.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/util/nordic_common.h
index 4468c0a..b0f8290 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/util/nordic_common.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/util/nordic_common.h
@@ -16,6 +16,10 @@
 #ifndef NORDIC_COMMON_H__
 #define NORDIC_COMMON_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /** The upper 8 bits of a 32 bit value */
 //lint -emacro(572,MSB) // Suppress warning 572 "Excessive shift value"
 #define MSB_32(a) (((a) & 0xFF000000) >> 24)
@@ -105,4 +109,8 @@
 #define UNUSED_PARAMETER(X) UNUSED_VARIABLE(X)
 #define UNUSED_RETURN_VALUE(X) UNUSED_VARIABLE(X)
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // NORDIC_COMMON_H__

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/util/nrf_assert.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/util/nrf_assert.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/util/nrf_assert.h
index a15b089..08758fd 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/util/nrf_assert.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/util/nrf_assert.h
@@ -18,6 +18,10 @@
 #include "nrf.h"
 #include "app_error.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #if defined(DEBUG_NRF) || defined(DEBUG_NRF_USER)
 
 /** @brief Function for handling assertions.
@@ -57,4 +61,8 @@ else                                                                          \
 __WEAK void assert_nrf_callback(uint16_t line_num, const uint8_t *file_name);
 #endif /* defined(DEBUG_NRF) || defined(DEBUG_NRF_USER) */
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* NRF_ASSERT_H_ */

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/util/nrf_log.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/util/nrf_log.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/util/nrf_log.h
index 5279d9f..d74af7d 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/util/nrf_log.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/util/nrf_log.h
@@ -1,6 +1,10 @@
 #ifndef NRF_LOG_H_
 #define NRF_LOG_H_
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #ifndef DOXYGEN
 
 #include <stdint.h>
@@ -696,4 +700,8 @@ uint32_t NRF_LOG_READ_INPUT(char* p_char);
 
 /** @} */
 #endif // DOXYGEN
+#ifdef __cplusplus
+}
+#endif
+
 #endif // NRF_LOG_H_

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/util/sdk_common.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/util/sdk_common.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/util/sdk_common.h
index ced9c6c..bab4964 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/util/sdk_common.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/util/sdk_common.h
@@ -32,6 +32,10 @@
 #include "sdk_errors.h"
 #include "app_util.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**@brief Macro for verifying that the module is initialized. It will cause the function to return
  *        if not.
  *
@@ -170,5 +174,9 @@ do                                          \
 
 /** @} */
 /** @endcond */
+#ifdef __cplusplus
+}
+#endif
+
 #endif // SDK_COMMON_H__
 

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/util/sdk_errors.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/util/sdk_errors.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/util/sdk_errors.h
index b72b85e..f3b5997 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/util/sdk_errors.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/util/sdk_errors.h
@@ -45,6 +45,10 @@
 #include <stdint.h>
 #include "nrf_error.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @defgroup sdk_err_base Base defined for SDK Modules
  * @{
@@ -111,5 +115,9 @@ typedef uint32_t ret_code_t;
 /** @} */
 /** @} */
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // SDK_ERRORS_H__
 

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/util/sdk_macros.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/util/sdk_macros.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/util/sdk_macros.h
index f916b6e..83e489f 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/util/sdk_macros.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/util/sdk_macros.h
@@ -22,6 +22,10 @@
 #ifndef SDK_MACROS_H__
 #define SDK_MACROS_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**@brief Macro for verifying that the module is initialized. It will cause the function to return
  *        @ref NRF_ERROR_INVALID_STATE if not.
  */
@@ -68,5 +72,9 @@ do                                                  \
 
 /** @} */
 /** @endcond */
+#ifdef __cplusplus
+}
+#endif
+
 #endif // SDK_MACROS_H__
 

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/util/sdk_mapped_flags.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/util/sdk_mapped_flags.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/util/sdk_mapped_flags.h
index 58474c2..63733bc 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/util/sdk_mapped_flags.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/util/sdk_mapped_flags.h
@@ -18,6 +18,10 @@
 #include "app_util.h"
 #include "compiler_abstraction.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @file
  * @defgroup sdk_mapped_flags Mapped flags
@@ -150,4 +154,8 @@ static __INLINE bool sdk_mapped_flags_any_set(sdk_mapped_flags_t flags)
 
 /** @} */
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* SDK_MAPPED_FLAGS_H__ */

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/util/sdk_os.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/util/sdk_os.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/util/sdk_os.h
index 5a736c6..3fbbf4b 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/util/sdk_os.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/util/sdk_os.h
@@ -25,6 +25,10 @@
 #ifndef SDK_OS_H__
 #define SDK_OS_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define SDK_MUTEX_DEFINE(X)
 #define SDK_MUTEX_INIT(X)
 #define SDK_MUTEX_LOCK(X)
@@ -36,5 +40,9 @@
  
 /** @} */
 /** @endcond */
+#ifdef __cplusplus
+}
+#endif
+
 #endif // SDK_OS_H__
 

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/util/sdk_resources.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/util/sdk_resources.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/util/sdk_resources.h
index 8d38348..c95a65e 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/util/sdk_resources.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/util/sdk_resources.h
@@ -16,6 +16,10 @@
 #ifndef APP_RESOURCES_H__
 #define APP_RESOURCES_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #ifdef SOFTDEVICE_PRESENT
 	#include "nrf_sd_def.h"
 #else
@@ -47,4 +51,8 @@
 #define NRF_SWI_USED          (SD_SWI_USED | GZLL_SWI_USED | ESB_SWI_USED)
 #define NRF_TIMERS_USED       (SD_TIMERS_USED | GZLL_TIMERS_USED | ESB_TIMERS_USED)
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // APP_RESOURCES_H__

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/serialization/application/codecs/common/ble_dtm_app.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/serialization/application/codecs/common/ble_dtm_app.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/serialization/application/codecs/common/ble_dtm_app.h
index da5e01c..e47ae2f 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/serialization/application/codecs/common/ble_dtm_app.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/serialization/application/codecs/common/ble_dtm_app.h
@@ -13,6 +13,10 @@
 #ifndef BLE_DTM_APP_H__
 #define BLE_DTM_APP_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @addtogroup ser_codecs Serialization codecs
  * @ingroup ble_sdk_lib_serialization
@@ -81,4 +85,8 @@ uint32_t ble_dtm_init_rsp_dec(uint8_t const * const p_buf,
 uint32_t ble_dtm_init(app_uart_stream_comm_params_t * p_uart_comm_params);
 
 /** @} */
+#ifdef __cplusplus
+}
+#endif
+
 #endif // BLE_DTM_APP_H__

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/serialization/application/codecs/common/conn_systemreset.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/serialization/application/codecs/common/conn_systemreset.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/serialization/application/codecs/common/conn_systemreset.h
index 1416b00..a1004aa 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/serialization/application/codecs/common/conn_systemreset.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/serialization/application/codecs/common/conn_systemreset.h
@@ -13,6 +13,10 @@
 #ifndef CONN_SYSTEMRESET_H__
 #define CONN_SYSTEMRESET_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @addtogroup ser_codecs Serialization codecs
  * @ingroup ble_sdk_lib_serialization
@@ -40,4 +44,8 @@
 uint32_t conn_systemreset(void);
 
 /** @} */
+#ifdef __cplusplus
+}
+#endif
+
 #endif // CONN_SYSTEMRESET_H__

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/serialization/application/codecs/s130/serializers/app_ble_gap_sec_keys.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/serialization/application/codecs/s130/serializers/app_ble_gap_sec_keys.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/serialization/application/codecs/s130/serializers/app_ble_gap_sec_keys.h
index 8d547d4..525e939 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/serialization/application/codecs/s130/serializers/app_ble_gap_sec_keys.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/serialization/application/codecs/s130/serializers/app_ble_gap_sec_keys.h
@@ -12,6 +12,10 @@
 #ifndef _APP_BLE_GAP_SEC_KEYS_H
 #define _APP_BLE_GAP_SEC_KEYS_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @addtogroup ser_codecs Serialization codecs
  * @ingroup ble_sdk_lib_serialization
@@ -78,4 +82,8 @@ uint32_t app_ble_gap_sec_context_destroy(uint16_t conn_handle);
 uint32_t app_ble_gap_sec_context_find(uint16_t conn_handle, uint32_t *p_index);
 /** @} */
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif //_APP_BLE_GAP_SEC_KEYS_H

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/serialization/application/codecs/s130/serializers/app_ble_user_mem.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/serialization/application/codecs/s130/serializers/app_ble_user_mem.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/serialization/application/codecs/s130/serializers/app_ble_user_mem.h
index f6bc731..c7ab7ca 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/serialization/application/codecs/s130/serializers/app_ble_user_mem.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/serialization/application/codecs/s130/serializers/app_ble_user_mem.h
@@ -12,6 +12,10 @@
 #ifndef _APP_BLE_USER_MEM_H
 #define _APP_BLE_USER_MEM_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @addtogroup ser_codecs Serialization codecs
  * @ingroup ble_sdk_lib_serialization
@@ -78,4 +82,8 @@ uint32_t app_ble_user_mem_context_destroy(uint16_t conn_handle);
 uint32_t app_ble_user_mem_context_find(uint16_t conn_handle, uint32_t *p_index);
 /** @} */
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif //_APP_BLE_USER_MEM_H

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/serialization/application/codecs/s130/serializers/ble_app.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/serialization/application/codecs/s130/serializers/ble_app.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/serialization/application/codecs/s130/serializers/ble_app.h
index c5888d6..a0f5c29 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/serialization/application/codecs/s130/serializers/ble_app.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/serialization/application/codecs/s130/serializers/ble_app.h
@@ -12,6 +12,10 @@
 #ifndef BLE_APP_H__
 #define BLE_APP_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @addtogroup ser_codecs Serialization codecs
  * @ingroup ble_sdk_lib_serialization
@@ -444,4 +448,8 @@ uint32_t ble_event_dec(uint8_t const * const p_buf,
                        uint32_t * const      p_event_len);
 
 /** @} */
+#ifdef __cplusplus
+}
+#endif
+
 #endif

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/serialization/application/codecs/s130/serializers/ble_evt_app.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/serialization/application/codecs/s130/serializers/ble_evt_app.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/serialization/application/codecs/s130/serializers/ble_evt_app.h
index c02a71e..cc42fba 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/serialization/application/codecs/s130/serializers/ble_evt_app.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/serialization/application/codecs/s130/serializers/ble_evt_app.h
@@ -12,6 +12,10 @@
 #ifndef BLE_EVT_APP_H__
 #define BLE_EVT_APP_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @addtogroup ser_codecs Serialization codecs
  * @ingroup ble_sdk_lib_serialization
@@ -108,4 +112,8 @@ uint32_t ble_evt_tx_complete_dec(uint8_t const * const p_buf,
                                        uint32_t * const      p_event_len);
 
 /** @} */
+#ifdef __cplusplus
+}
+#endif
+
 #endif

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/serialization/application/codecs/s130/serializers/ble_gap_app.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/serialization/application/codecs/s130/serializers/ble_gap_app.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/serialization/application/codecs/s130/serializers/ble_gap_app.h
index 2adc32f..0d791eb 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/serialization/application/codecs/s130/serializers/ble_gap_app.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/serialization/application/codecs/s130/serializers/ble_gap_app.h
@@ -12,6 +12,10 @@
 #ifndef BLE_GAP_APP_H__
 #define BLE_GAP_APP_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @addtogroup ser_codecs Serialization codecs
  * @ingroup ble_sdk_lib_serialization
@@ -1317,4 +1321,8 @@ uint32_t ble_gap_lesc_oob_data_get_rsp_dec(uint8_t const * const       p_buf,
                                            ble_gap_lesc_oob_data_t  * *pp_oobd_own,
                                            uint32_t * const            p_result_code);
 /** @} */
+#ifdef __cplusplus
+}
+#endif
+
 #endif

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/serialization/application/codecs/s130/serializers/ble_gap_evt_app.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/serialization/application/codecs/s130/serializers/ble_gap_evt_app.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/serialization/application/codecs/s130/serializers/ble_gap_evt_app.h
index 7f2f65d..12c1f1b 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/serialization/application/codecs/s130/serializers/ble_gap_evt_app.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/serialization/application/codecs/s130/serializers/ble_gap_evt_app.h
@@ -12,6 +12,10 @@
 #ifndef BLE_GAP_EVT_APP_H__
 #define BLE_GAP_EVT_APP_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @addtogroup ser_codecs Serialization codecs
  * @ingroup ble_sdk_lib_serialization
@@ -455,4 +459,8 @@ uint32_t ble_gap_evt_lesc_dhkey_request_dec(uint8_t const * const p_buf,
                                             ble_evt_t * const     p_event,
                                             uint32_t * const      p_event_len);
 /** @} */
+#ifdef __cplusplus
+}
+#endif
+
 #endif

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/serialization/application/codecs/s130/serializers/ble_gattc_app.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/serialization/application/codecs/s130/serializers/ble_gattc_app.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/serialization/application/codecs/s130/serializers/ble_gattc_app.h
index 4963897..77cbd59 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/serialization/application/codecs/s130/serializers/ble_gattc_app.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/serialization/application/codecs/s130/serializers/ble_gattc_app.h
@@ -12,6 +12,10 @@
 #ifndef BLE_GATTC_APP_H__
 #define BLE_GATTC_APP_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @addtogroup ser_codecs Serialization codecs
  * @ingroup ble_sdk_lib_serialization
@@ -438,6 +442,10 @@ uint32_t ble_gattc_attr_info_discover_rsp_dec(uint8_t const * const p_buf,
                                               uint32_t              packet_len,
                                               uint32_t * const      p_result_code);
 /** @} */
+#ifdef __cplusplus
+}
+#endif
+
 #endif
 
 

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/serialization/application/codecs/s130/serializers/ble_gattc_evt_app.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/serialization/application/codecs/s130/serializers/ble_gattc_evt_app.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/serialization/application/codecs/s130/serializers/ble_gattc_evt_app.h
index 14aeb1b..d379807 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/serialization/application/codecs/s130/serializers/ble_gattc_evt_app.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/serialization/application/codecs/s130/serializers/ble_gattc_evt_app.h
@@ -12,6 +12,10 @@
 #ifndef BLE_GATTC_EVT_APP_H__
 #define BLE_GATTC_EVT_APP_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @addtogroup ser_codecs Serialization codecs
  * @ingroup ble_sdk_lib_serialization
@@ -308,4 +312,8 @@ uint32_t ble_gattc_evt_attr_info_disc_rsp_dec(uint8_t const * const p_buf,
                                               uint32_t * const      p_event_len);
 
 /** @} */
+#ifdef __cplusplus
+}
+#endif
+
 #endif

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/serialization/application/codecs/s130/serializers/ble_gatts_app.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/serialization/application/codecs/s130/serializers/ble_gatts_app.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/serialization/application/codecs/s130/serializers/ble_gatts_app.h
index 989fd59..c5ed7c2 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/serialization/application/codecs/s130/serializers/ble_gatts_app.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/serialization/application/codecs/s130/serializers/ble_gatts_app.h
@@ -12,6 +12,10 @@
 #ifndef BLE_GATTS_APP_H__
 #define BLE_GATTS_APP_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @addtogroup ser_codecs Serialization codecs
  * @ingroup ble_sdk_lib_serialization
@@ -626,6 +630,10 @@ uint32_t ble_gatts_initial_user_handle_get_rsp_dec(uint8_t const * const  p_buf,
                                                    uint16_t ** pp_handle,
                                                    uint32_t * const       p_result_code);
 /** @} */
+#ifdef __cplusplus
+}
+#endif
+
 #endif //BLE_GATTS_APP_H__
 
 

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/serialization/application/codecs/s130/serializers/ble_gatts_evt_app.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/serialization/application/codecs/s130/serializers/ble_gatts_evt_app.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/serialization/application/codecs/s130/serializers/ble_gatts_evt_app.h
index 21e9b29..6e8ab02 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/serialization/application/codecs/s130/serializers/ble_gatts_evt_app.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/serialization/application/codecs/s130/serializers/ble_gatts_evt_app.h
@@ -12,6 +12,10 @@
 #ifndef BLE_GATTS_EVT_APP_H__
 #define BLE_GATTS_EVT_APP_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @addtogroup ser_codecs Serialization codecs
  * @ingroup ble_sdk_lib_serialization
@@ -183,4 +187,8 @@ uint32_t ble_gatts_evt_write_dec(uint8_t const * const p_buf,
                                  uint32_t * const      p_event_len);
 
 /** @} */
+#ifdef __cplusplus
+}
+#endif
+
 #endif

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/serialization/application/codecs/s130/serializers/ble_l2cap_app.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/serialization/application/codecs/s130/serializers/ble_l2cap_app.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/serialization/application/codecs/s130/serializers/ble_l2cap_app.h
index d12e83c..806a53d 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/serialization/application/codecs/s130/serializers/ble_l2cap_app.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/serialization/application/codecs/s130/serializers/ble_l2cap_app.h
@@ -34,6 +34,10 @@
 #include "ble_err.h"
 #include "ble_l2cap.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**@brief Register a CID with L2CAP.
  *
  * @details This registers a higher protocol layer with the L2CAP multiplexer, and is requried prior to all operations on the CID.
@@ -155,6 +159,10 @@ uint32_t ble_l2cap_tx_rsp_dec(uint8_t const * const p_buf,
                               uint32_t * const      p_result_code);
 
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif //BLE_L2CAP_APP_H__
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/serialization/application/codecs/s130/serializers/ble_l2cap_evt_app.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/serialization/application/codecs/s130/serializers/ble_l2cap_evt_app.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/serialization/application/codecs/s130/serializers/ble_l2cap_evt_app.h
index 5abc7ba..3c32be8 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/serialization/application/codecs/s130/serializers/ble_l2cap_evt_app.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/serialization/application/codecs/s130/serializers/ble_l2cap_evt_app.h
@@ -12,6 +12,10 @@
 #ifndef BLE_L2CAP_EVT_APP_H__
 #define BLE_L2CAP_EVT_APP_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @addtogroup ser_codecs Serialization codecs
  * @ingroup ble_sdk_lib_serialization
@@ -58,4 +62,8 @@ uint32_t ble_l2cap_evt_rx_dec(uint8_t const * const p_buf,
                               uint32_t * const      p_event_len);
 
 /** @} */
+#ifdef __cplusplus
+}
+#endif
+
 #endif

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/serialization/application/codecs/s130/serializers/nrf_soc_app.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/serialization/application/codecs/s130/serializers/nrf_soc_app.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/serialization/application/codecs/s130/serializers/nrf_soc_app.h
index 716a59a..bef156e 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/serialization/application/codecs/s130/serializers/nrf_soc_app.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/serialization/application/codecs/s130/serializers/nrf_soc_app.h
@@ -34,6 +34,10 @@
 
 #include <stdint.h>
 #include "nrf_soc.h"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**@brief Encodes @ref sd_power_system_off command request.
  *
  * @sa @ref nrf51_sd_power_off for packet format.
@@ -123,4 +127,8 @@ uint32_t ecb_block_encrypt_rsp_dec(uint8_t const * const  p_buf,
                                    uint32_t * const       p_result_code);
 /** @} */
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // NRF_SOC_APP_H__

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/serialization/application/hal/ser_app_hal.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/serialization/application/hal/ser_app_hal.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/serialization/application/hal/ser_app_hal.h
index 358a2a2..1ab75b4 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/serialization/application/hal/ser_app_hal.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/serialization/application/hal/ser_app_hal.h
@@ -24,6 +24,10 @@
 
 #include <stdint.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 typedef void (*ser_app_hal_flash_op_done_handler_t)(bool success);
 /**@brief Function for initializing hw modules.
  *
@@ -76,5 +80,9 @@ void ser_app_hal_nrf_evt_irq_priority_set(void);
 void ser_app_hal_nrf_evt_pending(void);
 
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* SER_APP_HAL_H_ */
 /** @} */

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/serialization/application/hal/ser_app_power_system_off.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/serialization/application/hal/ser_app_power_system_off.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/serialization/application/hal/ser_app_power_system_off.h
index 490b72d..7a6b095 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/serialization/application/hal/ser_app_power_system_off.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/serialization/application/hal/ser_app_power_system_off.h
@@ -15,10 +15,18 @@
 
 #include <stdbool.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 void ser_app_power_system_off_set(void);
 
 bool ser_app_power_system_off_get(void);
 
 void ser_app_power_system_off_enter(void);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/serialization/application/transport/ser_sd_transport.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/serialization/application/transport/ser_sd_transport.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/serialization/application/transport/ser_sd_transport.h
index 92a28d4..c6b14c7 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/serialization/application/transport/ser_sd_transport.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/serialization/application/transport/ser_sd_transport.h
@@ -37,6 +37,10 @@
 #include <stdint.h>
 #include <stdbool.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 typedef void (*ser_sd_transport_evt_handler_t)(uint8_t * p_buffer, uint16_t length);
 typedef void (*ser_sd_transport_rsp_wait_handler_t)(void);
 typedef void (*ser_sd_transport_rsp_set_handler_t)(void);
@@ -149,5 +153,9 @@ uint32_t ser_sd_transport_cmd_write(const uint8_t *                p_buffer,
                                     uint16_t                       length,
                                     ser_sd_transport_rsp_handler_t cmd_resp_decode_callback);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* SER_SD_TRANSPORT_H_ */
 /** @} */

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/serialization/application/transport/ser_softdevice_handler.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/serialization/application/transport/ser_softdevice_handler.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/serialization/application/transport/ser_softdevice_handler.h
index f9ded53..da9bfb3 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/serialization/application/transport/ser_softdevice_handler.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/serialization/application/transport/ser_softdevice_handler.h
@@ -31,6 +31,10 @@
 #include <stdbool.h>
 
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**@brief Function for checking if there is any more events in the internal mailbox.
  *
  * @param[in] p_mailbox_length Pointer to mailbox length.
@@ -40,5 +44,9 @@
  */
 uint32_t sd_ble_evt_mailbox_length_get(uint32_t * p_mailbox_length);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* SER_SOFTDEVICE_HANDLER_H_ */
 /** @} */

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/serialization/common/ble_serialization.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/serialization/common/ble_serialization.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/serialization/common/ble_serialization.h
index 39d8f20..b093fcc 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/serialization/common/ble_serialization.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/serialization/common/ble_serialization.h
@@ -18,6 +18,10 @@
 #include <stdint.h>
 #include <stddef.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**@brief The types of serialization packets. */
 typedef enum
 {
@@ -577,6 +581,10 @@ uint32_t uint8_vector_dec(uint8_t const * const p_buf,
                  uint16_t              dlen);
 
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
 
 

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/serialization/common/ser_config.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/serialization/common/ser_config.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/serialization/common/ser_config.h
index 67b4f8a..6b387d8 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/serialization/common/ser_config.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/serialization/common/ser_config.h
@@ -17,6 +17,10 @@
 
 #include "nrf.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /***********************************************************************************************//**
  * General parameters configuration.
  **************************************************************************************************/
@@ -110,4 +114,8 @@
 
 #define SER_MAX_CONNECTIONS 8
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* SER_CONFIG_H__ */