From be0f65a41793e4ecdd6dca2969cf948902e5c0d0 Mon Sep 17 00:00:00 2001 From: Bartek Szatkowski Date: Tue, 9 May 2017 15:53:46 +0100 Subject: [PATCH] Set mbed minor and patch version to 0 for master The proper version will be set for releases. --- mbed.h | 10 +++++++--- rtos/rtos.h | 4 ---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/mbed.h b/mbed.h index 9b1b01e8d6..8e689aedff 100644 --- a/mbed.h +++ b/mbed.h @@ -16,13 +16,17 @@ #ifndef MBED_H #define MBED_H -#define MBED_LIBRARY_VERSION 123 + +/* mbed minor and patch versions for both mbed 2 and mbed OS 5 are 0 on master branch. They are set + to meaningful values for releases and release branches. + */ +#define MBED_LIBRARY_VERSION 0 #if MBED_CONF_RTOS_PRESENT // RTOS present, this is valid only for mbed OS 5 #define MBED_MAJOR_VERSION 5 -#define MBED_MINOR_VERSION 2 -#define MBED_PATCH_VERSION 1 +#define MBED_MINOR_VERSION 0 +#define MBED_PATCH_VERSION 0 #else // mbed 2 diff --git a/rtos/rtos.h b/rtos/rtos.h index 54b31263d0..c3da7997cd 100644 --- a/rtos/rtos.h +++ b/rtos/rtos.h @@ -40,10 +40,6 @@ using namespace rtos; */ #include "mbed.h" -#if (MBED_LIBRARY_VERSION < 122) -#error "This version of RTOS requires mbed library version > 121" -#endif - #endif /** @}*/