Diff: btle/btle.cpp

Revision:

52:120bd37b9d0d

Parent:

41:6e66cd970659

Child:

56:a1071b629aa3

diff -r 63ba3bcf5cd6 -r 120bd37b9d0d btle/btle.cpp
--- a/btle/btle.cpp	Wed Jul 23 12:01:30 2014 +0100
+++ b/btle/btle.cpp	Thu Jul 24 15:46:29 2014 +0100
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 #include "common/common.h"
 #include "nordic_common.h"
 
@@ -34,14 +35,14 @@
 #include "softdevice_handler.h"
 #include "pstorage.h"
 
-#include "hw/GapEvents.h"
+#include "GapEvents.h"
 #include "nRF51Gap.h"
 #include "nRF51GattServer.h"
 
 #if NEED_BOND_MANAGER /* disabled by default */
 static void service_error_callback(uint32_t nrf_error);
 #endif
-void        assert_nrf_callback(uint16_t line_num, const uint8_t *p_file_name);
+extern "C" void        assert_nrf_callback(uint16_t line_num, const uint8_t *p_file_name);
 void        app_error_handler(uint32_t       error_code,
                               uint32_t       line_num,
                               const uint8_t *p_file_name);