Эх сурвалжийг харах

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
Ivan Grokhotkov 4 жил өмнө
parent
commit
afe14a5ed2

+ 10 - 1
components/newlib/platform_include/sys/dirent.h

@@ -19,11 +19,16 @@
 
 /**
  * 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
  * for reference.
  */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @brief Opaque directory structure
  */
@@ -57,3 +62,7 @@ void seekdir(DIR* pdir, long loc);
 void rewinddir(DIR* pdir);
 int closedir(DIR* pdir);
 int readdir_r(DIR* pdir, struct dirent* entry, struct dirent** out_dirent);
+
+#ifdef __cplusplus
+}
+#endif

+ 0 - 2
tools/ci/check_public_headers_exceptions.txt

@@ -30,8 +30,6 @@ components/lwip/include/apps/dhcpserver/dhcpserver.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/spi_flash/include/spi_flash_chip_issi.h