Revision 228:85a676113daa, committed 2014-06-12

Comitter:

mbed_official

Date:

Thu Jun 12 10:15:07 2014 +0100

Parent:

227:7bd0639b8911

Child:

229:9bd26d142f33

Commit message:

Synchronized with git revision 0b5a92fbc54f70168b85f7a58bab07c5b787ab13

Full URL: https://github.com/mbedmicro/mbed/commit/0b5a92fbc54f70168b85f7a58bab07c5b787ab13/

Error header inclusion in the error code file - fix.

Changed in this revision

--- a/api/error.h	Wed Jun 11 16:00:09 2014 +0100
+++ b/api/error.h	Thu Jun 12 10:15:07 2014 +0100
@@ -53,8 +53,6 @@
  * #endcode
  */
 
-#include "toolchain.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif

--- a/common/board.c	Wed Jun 11 16:00:09 2014 +0100
+++ b/common/board.c	Thu Jun 12 10:15:07 2014 +0100
@@ -16,8 +16,8 @@
 #include "gpio_api.h"
 #include "wait_api.h"
 #include "toolchain.h"
+#include "mbed_interface.h"
 
-WEAK void mbed_die(void);
 WEAK void mbed_die(void) {
 #ifndef NRF51_H
 	__disable_irq();	// dont allow interrupts to disturb the flash pattern

--- a/common/error.c	Wed Jun 11 16:00:09 2014 +0100
+++ b/common/error.c	Thu Jun 12 10:15:07 2014 +0100
@@ -17,11 +17,11 @@
 #include <stdarg.h>
 #include "device.h"
 #include "toolchain.h"
+#include "error.h"
 #if DEVICE_STDIO_MESSAGES
 #include <stdio.h>
 #endif
 
-WEAK void error(const char* format, ...);
 WEAK void error(const char* format, ...) {
 #if DEVICE_STDIO_MESSAGES
     va_list arg;

--- a/common/mbed_interface.c	Wed Jun 11 16:00:09 2014 +0100
+++ b/common/mbed_interface.c	Thu Jun 12 10:15:07 2014 +0100
@@ -38,7 +38,6 @@
     }
 }
 
-WEAK int mbed_interface_uid(char *uid);
 WEAK int mbed_interface_uid(char *uid) {
     if (mbed_interface_connected()) {
         return semihost_uid(uid); // Returns 0 if successful, -1 on failure
@@ -77,13 +76,11 @@
     mbed_interface_reset();
 }
 
-WEAK int mbed_uid(char *uid);
 WEAK int mbed_uid(char *uid) {
     return mbed_interface_uid(uid);
 }
 #endif
 
-WEAK void mbed_mac_address(char *mac);
 WEAK void mbed_mac_address(char *mac) {
 #if DEVICE_SEMIHOST
     char uid[DEVICE_ID_LENGTH + 1];