Merge branch 'fix/fix-gcc13-dirent-breaking' into 'master'

fix(newlib): fix include sys/dirent.h breaking change

See merge request espressif/esp-idf!32469
This commit is contained in:
Alexey Lapshin 2024-08-01 19:27:24 +08:00
commit cd0e34ed87
2 changed files with 6 additions and 4 deletions

View File

@ -5,9 +5,6 @@ if(${target} STREQUAL "linux")
endif()
set(include_dirs "platform_include")
if(CMAKE_C_COMPILER_ID MATCHES "Clang") # TODO LLVM-330
list(APPEND include_dirs "clang_include")
endif()
if(BOOTLOADER_BUILD)
# Bootloader builds need the platform_include directory (for assert.h), but nothing else

View File

@ -3,7 +3,7 @@
*
* SPDX-License-Identifier: Apache-2.0
*/
#ifdef __clang__ // TODO LLVM-330
#pragma once
#include <stddef.h>
@ -63,3 +63,8 @@ int alphasort(const struct dirent **d1, const struct dirent **d2);
#ifdef __cplusplus
}
#endif
#else // __clang__ TODO: IDF-10675
#include_next <sys/dirent.h>
#include <dirent.h>
#endif // __clang__