From 0246230e2b7c542f003c3c53cffc22dedc0c9c50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Mon, 19 Feb 2024 10:56:05 +0100 Subject: [PATCH] Partial revert of `core/version.h` changes in #88527 I misunderstood what this does, we still use this code. --- core/version.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/core/version.h b/core/version.h index 05cc25bc1cc..abb81312ac9 100644 --- a/core/version.h +++ b/core/version.h @@ -47,8 +47,13 @@ // forward-compatible. // Example: "3.1" #define VERSION_BRANCH _MKSTR(VERSION_MAJOR) "." _MKSTR(VERSION_MINOR) +#if VERSION_PATCH // Example: "3.1.4" #define VERSION_NUMBER VERSION_BRANCH "." _MKSTR(VERSION_PATCH) +#else // patch is 0, we don't include it in the "pretty" version number. +// Example: "3.1" instead of "3.1.0" +#define VERSION_NUMBER VERSION_BRANCH +#endif // VERSION_PATCH // Version number encoded as hexadecimal int with one byte for each number, // for easy comparison from code.