Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(esp_common): fix C++ variant of ESP_RETURN_VOID_ON_FALSE (IDFGH-14125) #14929

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion components/esp_common/include/esp_check.h
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ extern "C" {
* Macro which can be used to check the condition. If the condition is not 'true', it prints the message
* and returns without a value.
*/
#define ESP_RETURN_VOID_ON_FALSE(a, err_code, log_tag, format, ...) do { \
#define ESP_RETURN_VOID_ON_FALSE(a, log_tag, format, ...) do { \
if (unlikely(!(a))) { \
ESP_LOGE(log_tag, "%s(%d): " format, __FUNCTION__, __LINE__ __VA_OPT__(,) __VA_ARGS__); \
return; \
Expand Down
10 changes: 0 additions & 10 deletions tools/ci/check_public_headers_exceptions.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,7 @@ components/log/include/esp_log_internal.h

# LWIP: sockets.h uses #include_next<>, which doesn't work correctly with the checker
# memp_std.h is supposed to be included multiple times with different settings
components/lwip/lwip/src/include/lwip/priv/memp_std.h
components/lwip/include/lwip/sockets.h
components/lwip/lwip/src/include/lwip/prot/nd6.h
components/lwip/lwip/src/include/netif/ppp/
components/lwip/lwip/src/include/lwip/apps/tftp_server.h
components/lwip/lwip/src/include/lwip/apps/tftp_client.h

components/spi_flash/include/spi_flash_chip_issi.h
components/spi_flash/include/spi_flash_chip_mxic.h
Expand Down Expand Up @@ -60,20 +55,15 @@ components/json/cJSON/

components/spiffs/include/spiffs_config.h

components/unity/unity/src/unity_internals.h
components/unity/include/unity_config.h
components/unity/include/unity_test_runner.h

components/cmock/CMock/src/cmock.h
components/cmock/CMock/src/cmock_internals.h


components/openthread/openthread/

# The following TLSF headers contain object definitions but have to be
# made public to be used in esp_rom to help patching the TLSF in ROM.
components/heap/tlsf/tlsf_block_functions.h
components/heap/tlsf/tlsf_control_functions.h

### Here are the files that do not compile for some reason
#
Expand Down