Skip to content

Commit

Permalink
Merge pull request #4634 from Patater/mbed-can-do-timing
Browse files Browse the repository at this point in the history
config: Allow Mbed to implement TIMING_C
  • Loading branch information
ronald-cron-arm authored Jun 11, 2021
2 parents 88c88ed + 197496a commit 57864fa
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
3 changes: 3 additions & 0 deletions ChangeLog.d/mbed-can-do-timing.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Bugfix
* Remove outdated check-config.h check that prevented implementing the
timing module on Mbed OS. Fixes #4633.
5 changes: 2 additions & 3 deletions include/mbedtls/check_config.h
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,8 @@
#endif
#endif /* _WIN32 */

#if defined(TARGET_LIKE_MBED) && \
( defined(MBEDTLS_NET_C) || defined(MBEDTLS_TIMING_C) )
#error "The NET and TIMING modules are not available for mbed OS - please use the network and timing functions provided by mbed OS"
#if defined(TARGET_LIKE_MBED) && defined(MBEDTLS_NET_C)
#error "The NET module is not available for mbed OS - please use the network functions provided by Mbed OS"
#endif

#if defined(MBEDTLS_DEPRECATED_WARNING) && \
Expand Down

0 comments on commit 57864fa

Please sign in to comment.