add missing ioctl declaration

Previously ioctl was declared as a macro in lwip/sockets.h.
Disabling LWIP_POSIX_SOCKETS_IO_NAMES removed that declaration.

This adds sys/ioctl.h file and the missing declaration.
Also adds missing includes in vfs.c.

diff --git a/components/lwip/include/lwip/port/lwipopts.h b/components/lwip/include/lwip/port/lwipopts.h
index 88f4b1184d8492866cf3bca9cc42dcd310204d55..6f56f263e76ee03a93f50c1ef38d9cf8ac82da74 100644 (file)
--- a/components/lwip/include/lwip/port/lwipopts.h
+++ b/components/lwip/include/lwip/port/lwipopts.h
@@ -37,6 +37,7 @@
 #include <unistd.h>
 #include <sys/time.h>
 #include <sys/fcntl.h>
+#include <sys/ioctl.h>
 #include "esp_task.h"
 #include "esp_system.h"
 #include "sdkconfig.h"

diff --git a/components/vfs/include/sys/ioctl.h b/components/vfs/include/sys/ioctl.h
new file mode 100644 (file)
index 0000000..95bad98
--- /dev/null
+++ b/components/vfs/include/sys/ioctl.h
@@ -0,0 +1,18 @@
+// Copyright 2015-2017 Espressif Systems (Shanghai) PTE LTD
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+int ioctl(int fd, int request, ...);
+

diff --git a/components/vfs/vfs.c b/components/vfs/vfs.c
index 2a69df78ae5fd23141e14e786d3b5af0ae41296b..5dbd462c2e5a52b356ecf263e49b2980c29d93a6 100644 (file)
--- a/components/vfs/vfs.c
+++ b/components/vfs/vfs.c
@@ -16,6 +16,10 @@
 #include <string.h>
 #include <assert.h>
 #include <sys/errno.h>
+#include <sys/fcntl.h>
+#include <sys/ioctl.h>
+#include <sys/unistd.h>
+#include <dirent.h>
 #include "esp_vfs.h"
 #include "esp_log.h"