Joseph Boettcher / mbed-rtos

sdf

Dependencies:   mbed-rtos

Fork of mbed-rtos by mbed official

Files at this revision

API Documentation at this revision

Revision 36:512640f00564, committed 2014-07-08

Comitter:
mbed_official
Date:
Tue Jul 08 14:15:17 2014 +0100
Parent:
35:b8555a5966f6
Child:
37:478a48c29e88
Commit message:
Synchronized with git revision b0ac1e3485a9aa1cb98d1ca68df9d1cdbcd6ce63

Full URL: https://github.com/mbedmicro/mbed/commit/b0ac1e3485a9aa1cb98d1ca68df9d1cdbcd6ce63/

Revert "error.h -> mbed_error.h"

Changed in this revision

rtos/Mutex.cpp Show annotated file Show diff for this revision Revisions of this file
rtos/Queue.h Show annotated file Show diff for this revision Revisions of this file
rtos/RtosTimer.cpp Show annotated file Show diff for this revision Revisions of this file
rtos/Semaphore.cpp Show annotated file Show diff for this revision Revisions of this file
rtos/Thread.cpp Show annotated file Show diff for this revision Revisions of this file
rtx/RTX_CM_lib.h Show annotated file Show diff for this revision Revisions of this file 
--- a/rtos/Mutex.cpp	Tue Jul 08 11:15:19 2014 +0100
+++ b/rtos/Mutex.cpp	Tue Jul 08 14:15:17 2014 +0100
@@ -22,7 +22,7 @@
 #include "Mutex.h"
 
 #include <string.h>
-#include "mbed_error.h"
+#include "error.h"
 
 namespace rtos {
 

--- a/rtos/Queue.h	Tue Jul 08 11:15:19 2014 +0100
+++ b/rtos/Queue.h	Tue Jul 08 14:15:17 2014 +0100
@@ -26,7 +26,7 @@
 #include <string.h>
 
 #include "cmsis_os.h"
-#include "mbed_error.h"
+#include "error.h"
 
 namespace rtos {
 

--- a/rtos/RtosTimer.cpp	Tue Jul 08 11:15:19 2014 +0100
+++ b/rtos/RtosTimer.cpp	Tue Jul 08 14:15:17 2014 +0100
@@ -24,7 +24,7 @@
 #include <string.h>
 
 #include "cmsis_os.h"
-#include "mbed_error.h"
+#include "error.h"
 
 namespace rtos {
 

--- a/rtos/Semaphore.cpp	Tue Jul 08 11:15:19 2014 +0100
+++ b/rtos/Semaphore.cpp	Tue Jul 08 14:15:17 2014 +0100
@@ -22,6 +22,7 @@
 #include "Semaphore.h"
 
 #include <string.h>
+#include "error.h"
 
 namespace rtos {
 

--- a/rtos/Thread.cpp	Tue Jul 08 11:15:19 2014 +0100
+++ b/rtos/Thread.cpp	Tue Jul 08 14:15:17 2014 +0100
@@ -21,7 +21,7 @@
  */
 #include "Thread.h"
 
-#include "mbed_error.h"
+#include "error.h"
 
 namespace rtos {
 

--- a/rtx/RTX_CM_lib.h	Tue Jul 08 11:15:19 2014 +0100
+++ b/rtx/RTX_CM_lib.h	Tue Jul 08 14:15:17 2014 +0100
@@ -31,7 +31,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *---------------------------------------------------------------------------*/
-#include "mbed_error.h"
+#include "error.h"
 
 #if   defined (__CC_ARM)
 #pragma O3