Skip to content

Commit 25d8871

Browse files
committed
extmod/mbedtls: Undefine ARRAY_SIZE if defined by platform.
This is an annoying regression caused by including mpconfig.h in 36922df - the mimxrt platform headers define ARRAY_SIZE and mbedtls also defines in some source files, using a different parameter name which is a warning in gcc. Technically mimxrt SDK is to blame here, but as this isn't a named warning in gcc the only way to work around it in the mimxrt port would be to disable all warnings when building this particular mbedTLS source file. This work was funded through GitHub Sponsors. Signed-off-by: Angus Gratton <angus@redyak.com.au>
1 parent 2f13db2 commit 25d8871

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

extmod/mbedtls/mbedtls_config_common.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,4 +123,8 @@ void m_tracked_free(void *ptr);
123123

124124
#endif
125125

126+
// Workaround for a mimxrt platform driver header that defines ARRAY_SIZE,
127+
// which is also defined in some mbedtls source files.
128+
#undef ARRAY_SIZE
129+
126130
#endif // MICROPY_INCLUDED_MBEDTLS_CONFIG_COMMON_H

0 commit comments

Comments
 (0)