Merge pull request #18849 from benpicco/core-SIGNOF

core/macros: fix SIGNOF() macro when applied to size_t
RIOT-OS · Nov 9, 2022 · e402e3f · e402e3f
2 parents 15448bf + 8f8bb6c
commit e402e3f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/core/include/macros/math.h b/core/include/macros/math.h
@@ -31,7 +31,7 @@ extern "C" {
                               unsigned int: 1,           \
                               unsigned long: 1,          \
                               unsigned long long: 1,     \
-                              default: (long long)(a) < 0 ? -1 : 1)
+                              default: ((a) <= 0 ? ((a) == 0 ? 1L : -1L ): 1L))
 /**
  * @brief Calculates @p a/ @p b with arithmetic rounding
  */

diff --git a/tests/unittests/tests-core/tests-core-macros.c b/tests/unittests/tests-core/tests-core-macros.c
@@ -22,7 +22,9 @@ static void test_math_signof(void)
 
 static void test_math_div_round(void)
 {
-    TEST_ASSERT_EQUAL_INT(3, DIV_ROUND(20, 7));
+    size_t a = 20;
+
+    TEST_ASSERT_EQUAL_INT(3, DIV_ROUND(a, 7));
     TEST_ASSERT_EQUAL_INT(3, DIV_ROUND(21, 7));
     TEST_ASSERT_EQUAL_INT(3, DIV_ROUND(22, 7));
     TEST_ASSERT_EQUAL_INT(0, DIV_ROUND(1, UINT32_MAX));