Merge branch 'feature/modify_std_io_header_file_declare' into 'master'

donghengqaz · donghengqaz · commit a80d15f76881 · 2019-06-13T16:47:05.000+08:00
esp-lMidify stand I/O control APIs declare

See merge request sdk/ESP8266_RTOS_SDK!982
diff --git a/components/lwip/lwip/src/include/lwip/sockets.h b/components/lwip/lwip/src/include/lwip/sockets.h
@@ -580,9 +580,15 @@ int lwip_fcntl(int s, int cmd, int val);
 /** @ingroup socket */
 #define close(s)                                  lwip_close(s)
 /** @ingroup socket */
-#define fcntl(s,cmd,val)                          lwip_fcntl(s,cmd,val)
+
+/* Disable here to use stand APIs */
+//#define fcntl(s,cmd,val)                          lwip_fcntl(s,cmd,val)
 /** @ingroup socket */
-#define ioctl(s,cmd,argp)                         lwip_ioctl(s,cmd,argp)
+//#define ioctl(s,cmd,argp)                         lwip_ioctl(s,cmd,argp)
+
+int ioctl(int fd, int request, ...);
+int fcntl(int fd, int request, ...);
+
 #endif /* LWIP_POSIX_SOCKETS_IO_NAMES */
 #endif /* LWIP_COMPAT_SOCKETS != 2 */
 
diff --git a/components/lwip/lwip/src/include/posix/sys/socket.h b/components/lwip/lwip/src/include/posix/sys/socket.h
@@ -33,8 +33,3 @@
 #include "sdkconfig.h"
 
 #include "lwip/sockets.h"
-
-#ifdef CONFIG_USING_ESP_VFS
-#include <unistd.h>
-#include <fcntl.h>
-#endif
diff --git a/components/newlib/newlib/include/fcntl.h b/components/newlib/newlib/include/fcntl.h
@@ -1,7 +1,4 @@
 
 #pragma once
 
-#include <sys/socket.h>
-#undef fcntl
-
 #include <sys/fcntl.h>
diff --git a/components/vfs/port/fcntl.c b/components/vfs/port/fcntl.c
@@ -19,6 +19,8 @@
 #include <stdarg.h>
 #include <fcntl.h>
 
+#include "lwip/sockets.h"
+
 int fcntl(int fd, int request, ...)
 {
     int val, ret;
