Merge branch 'bugfix/newlib_dirent_decls' into 'master'

newlib: add C++ guards to the platform-specific dirent.h

Closes IDFGH-5465

See merge request espressif/esp-idf!14308
This commit is contained in:
Ivan Grokhotkov
2021-07-15 07:27:14 +00:00
2 changed files with 10 additions and 3 deletions

View File

@@ -19,11 +19,16 @@
/** /**
* This header file provides POSIX-compatible definitions of directory * This header file provides POSIX-compatible definitions of directory
* access functions and related data types. * access data types. Starting with newlib 3.3, related functions are defined
* in 'dirent.h' bundled with newlib.
* See http://pubs.opengroup.org/onlinepubs/7908799/xsh/dirent.h.html * See http://pubs.opengroup.org/onlinepubs/7908799/xsh/dirent.h.html
* for reference. * for reference.
*/ */
#ifdef __cplusplus
extern "C" {
#endif
/** /**
* @brief Opaque directory structure * @brief Opaque directory structure
*/ */
@@ -57,3 +62,7 @@ void seekdir(DIR* pdir, long loc);
void rewinddir(DIR* pdir); void rewinddir(DIR* pdir);
int closedir(DIR* pdir); int closedir(DIR* pdir);
int readdir_r(DIR* pdir, struct dirent* entry, struct dirent** out_dirent); int readdir_r(DIR* pdir, struct dirent* entry, struct dirent** out_dirent);
#ifdef __cplusplus
}
#endif

View File

@@ -30,8 +30,6 @@ components/lwip/include/apps/dhcpserver/dhcpserver.h
components/lwip/lwip/src/include/lwip/priv/memp_std.h components/lwip/lwip/src/include/lwip/priv/memp_std.h
components/vfs/include/sys/dirent.h
components/esp_phy/esp32/include/phy_init_data.h components/esp_phy/esp32/include/phy_init_data.h
components/spi_flash/include/spi_flash_chip_issi.h components/spi_flash/include/spi_flash_chip_issi.h