Merge pull request #4292 from bulislaw/fix_release_version

Set mbed minor and patch version to 0 for master
pull/4322/head
Martin Kojtal 2017-05-15 16:19:41 +01:00 committed by GitHub
commit 1b94d5abd1
2 changed files with 7 additions and 7 deletions

10
mbed.h
View File

@ -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

View File

@ -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
/** @}*/