Merge pull request #1395 from NickeZ/nickez/fix-duplicate-asserts

NickeZ · web-flow · commit 437261e3c752 · 2025-04-01T18:56:33.000+02:00
newlib-compat: macro conflict between asf4 and std
diff --git a/external/asf4-drivers/hal/utils/include/utils_assert.h b/external/asf4-drivers/hal/utils/include/utils_assert.h
@@ -44,6 +44,9 @@ extern "C" {
 //# define USE_SIMPLE_ASSERT
 #endif
 
+// Bitbox modification. `utils_assert.h` is not compatible with std `assert.h`
+#undef assert
+
 /**
  * \brief Assert macro
  *

Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,9 @@ extern "C" {`
`44`	`44`	`//# define USE_SIMPLE_ASSERT`
`45`	`45`	`#endif`
`46`	`46`
	`47`	+// Bitbox modification. `utils_assert.h` is not compatible with std `assert.h`
	`48`	`+#undef assert`
	`49`	`+`
`47`	`50`	`/**`
`48`	`51`	`* \brief Assert macro`
`49`	`52`	`*`