From af2082e1225889fb0a50c829fe7517ecb79f94d6 Mon Sep 17 00:00:00 2001 From: Li Cao Date: Thu, 10 Feb 2022 09:23:09 +0800 Subject: [PATCH] [version] fix `OPENTHREAD_BUILD_DATETIME` in version string (#7398) If `OPENTHREAD_BUILD_DATETIME` is defined by the build system, the version string would be something like: OPENTHREAD/20191113-03303-gbdeacdc55-dirty; NRF52840DK-engFeb 08 2022 13:05:38 ^^ We shouldn't put the separator in the macro, but put it in the version string instead. --- src/core/api/instance_api.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/core/api/instance_api.cpp b/src/core/api/instance_api.cpp index f9cc00e3c..76ec953ca 100644 --- a/src/core/api/instance_api.cpp +++ b/src/core/api/instance_api.cpp @@ -51,7 +51,7 @@ #endif #else // __ANDROID__ #if defined(__DATE__) -#define OPENTHREAD_BUILD_DATETIME "; " __DATE__ " " __TIME__ +#define OPENTHREAD_BUILD_DATETIME __DATE__ " " __TIME__ #endif #endif // __ANDROID__ #endif // !defined(OPENTHREAD_BUILD_DATETIME) @@ -179,10 +179,10 @@ const char *otGetVersionString(void) #endif const char sVersion[] = PACKAGE_NAME "/" PACKAGE_VERSION "; " OPENTHREAD_CONFIG_PLATFORM_INFO #ifdef OPENTHREAD_BUILD_DATETIME - OPENTHREAD_BUILD_DATETIME + "; " OPENTHREAD_BUILD_DATETIME #endif #ifdef PLATFORM_VERSION_ATTR_SUFFIX - PLATFORM_VERSION_ATTR_SUFFIX + PLATFORM_VERSION_ATTR_SUFFIX #endif ; // Trailing semicolon to end statement.