From 1b4a81637dd774608c77c31f19385fcdb9377313 Mon Sep 17 00:00:00 2001 From: Robert Schmidt Date: Fri, 22 Apr 2022 13:42:51 +0200 Subject: [PATCH] Accept higher vers. nums in make_version/MAKE_VERSION --- cmake_targets/macros.cmake | 2 +- openair1/PHY/types.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake_targets/macros.cmake b/cmake_targets/macros.cmake index 0417420af4..3de95580ef 100644 --- a/cmake_targets/macros.cmake +++ b/cmake_targets/macros.cmake @@ -77,7 +77,7 @@ endmacro(add_list_string_option) function(make_version VERSION_VALUE) math(EXPR RESULT "0") foreach (ARG ${ARGN}) - math(EXPR RESULT "${RESULT} * 16 + ${ARG}") + math(EXPR RESULT "${RESULT} * 256 + ${ARG}") endforeach() set(${VERSION_VALUE} "${RESULT}" PARENT_SCOPE) endfunction() diff --git a/openair1/PHY/types.h b/openair1/PHY/types.h index 8d8d9db2de..913db62231 100644 --- a/openair1/PHY/types.h +++ b/openair1/PHY/types.h @@ -23,6 +23,6 @@ #define __openair_TYPES_H__ #include -#define MAKE_VERSION(a,b,c) ((a)*256+(b)*16+c) +#define MAKE_VERSION(a,b,c) ((a)*65536+(b)*256+c) #endif /*__openair_TYPES_H__ */