Suffer the consequences of moving struct timeval to its correct location

15 files changed, 17 insertions, 2 deletions

diff --git a/apps/examples/cc3000/cc3000basic.c b/apps/examples/cc3000/cc3000basic.c
index e1b17f8b4..a3747a4bc 100644
--- a/apps/examples/cc3000/cc3000basic.c
+++ b/apps/examples/cc3000/cc3000basic.c
@@ -113,6 +113,7 @@
 #include <stdbool.h>
 #include <sys/time.h>
 #include <arpa/inet.h>
+
 #include <nuttx/arch.h>
 #include <nuttx/wireless/cc3000/nvmem.h>
 #include <nuttx/wireless/cc3000/include/sys/socket.h>
@@ -120,6 +121,7 @@
 #include <nuttx/wireless/cc3000/hci.h>
 #include <nuttx/wireless/cc3000/security.h>
 #include <nuttx/wireless/cc3000/netapp.h>
+
 #include "shell.h"
 
 /****************************************************************************
diff --git a/apps/examples/poll/net_listener.c b/apps/examples/poll/net_listener.c
index ce068585a..aadc5a2ba 100644
--- a/apps/examples/poll/net_listener.c
+++ b/apps/examples/poll/net_listener.c
@@ -43,6 +43,7 @@
 #include <sys/select.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
+#include <sys/time.h>
 
 #include <stdint.h>
 #include <stdbool.h>
diff --git a/apps/examples/poll/net_reader.c b/apps/examples/poll/net_reader.c
index 8597acdab..082ce1b41 100644
--- a/apps/examples/poll/net_reader.c
+++ b/apps/examples/poll/net_reader.c
@@ -43,6 +43,7 @@
 #include <sys/stat.h>
 #include <sys/select.h>
 #include <sys/socket.h>
+#include <sys/time.h>
 
 #include <stdint.h>
 #include <stdio.h>
diff --git a/apps/examples/poll/select_listener.c b/apps/examples/poll/select_listener.c
index 65e6b6a72..b624cbef7 100644
--- a/apps/examples/poll/select_listener.c
+++ b/apps/examples/poll/select_listener.c
@@ -42,6 +42,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/select.h>
+#include <sys/time.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <unistd.h>
diff --git a/apps/modbus/nuttx/portserial.c b/apps/modbus/nuttx/portserial.c
index fdeb9bc6b..c3c7baa37 100644
--- a/apps/modbus/nuttx/portserial.c
+++ b/apps/modbus/nuttx/portserial.c
@@ -31,6 +31,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/select.h>
+#include <sys/time.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <assert.h>
diff --git a/apps/netutils/dhcpc/dhcpc.c b/apps/netutils/dhcpc/dhcpc.c
index b6e0c6b14..974618b38 100644
--- a/apps/netutils/dhcpc/dhcpc.c
+++ b/apps/netutils/dhcpc/dhcpc.c
@@ -43,6 +43,7 @@
 
 #include <sys/types.h>
 #include <sys/socket.h>
+#include <sys/time.h>
 
 #include <stdlib.h>
 #include <stdint.h>
diff --git a/apps/netutils/dnsclient/dns_socket.c b/apps/netutils/dnsclient/dns_socket.c
index 693aae7f7..eb09cd72a 100644
--- a/apps/netutils/dnsclient/dns_socket.c
+++ b/apps/netutils/dnsclient/dns_socket.c
@@ -48,6 +48,8 @@
 
 #include <nuttx/config.h>
 
+#include <sys/socket.h>
+#include <sys/time.h>
 #include <stdint.h>
 #include <string.h>
 #include <unistd.h>
@@ -56,7 +58,6 @@
 #include <debug.h>
 #include <assert.h>
 
-#include <sys/socket.h>
 #include <arpa/inet.h>
 #include <netinet/in.h>
 
diff --git a/apps/netutils/ntpclient/ntpclient.c b/apps/netutils/ntpclient/ntpclient.c
index a0d8d19f6..13607c420 100644
--- a/apps/netutils/ntpclient/ntpclient.c
+++ b/apps/netutils/ntpclient/ntpclient.c
@@ -40,6 +40,7 @@
 #include <nuttx/config.h>
 
 #include <sys/socket.h>
+#include <sys/time.h>
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/apps/netutils/tftpc/tftpc_packets.c b/apps/netutils/tftpc/tftpc_packets.c
index 8775ca3a2..bf7aaef00 100644
--- a/apps/netutils/tftpc/tftpc_packets.c
+++ b/apps/netutils/tftpc/tftpc_packets.c
@@ -41,6 +41,7 @@
 
 #include <sys/types.h>
 #include <sys/socket.h>
+#include <sys/time.h>
 #include <stdint.h>
 #include <stdbool.h>
 #include <stdio.h>
diff --git a/apps/netutils/thttpd/libhttpd.h b/apps/netutils/thttpd/libhttpd.h
index b245a6edf..248d9bbe2 100644
--- a/apps/netutils/thttpd/libhttpd.h
+++ b/apps/netutils/thttpd/libhttpd.h
@@ -45,6 +45,7 @@
 
 #include <sys/types.h>
 #include <sys/socket.h>
+#include <sys/time.h>
 #include <stdint.h>
 #include <stdbool.h>
 #include <netinet/in.h>
diff --git a/apps/netutils/thttpd/thttpd_cgi.c b/apps/netutils/thttpd/thttpd_cgi.c
index 27eb470cf..d02ebd18e 100644
--- a/apps/netutils/thttpd/thttpd_cgi.c
+++ b/apps/netutils/thttpd/thttpd_cgi.c
@@ -42,6 +42,7 @@
 
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <sys/time.h>
 #include <stdint.h>
 #include <stdbool.h>
 #include <stdio.h>
diff --git a/apps/netutils/thttpd/thttpd_cgi.h b/apps/netutils/thttpd/thttpd_cgi.h
index 47923223c..5431156d8 100644
--- a/apps/netutils/thttpd/thttpd_cgi.h
+++ b/apps/netutils/thttpd/thttpd_cgi.h
@@ -54,6 +54,7 @@
 
 extern int cgi(httpd_conn *hc);
 #if CONFIG_THTTPD_CGI_TIMELIMIT > 0
+struct timeval;
 static void cgi_kill(ClientData client_data, struct timeval *now);
 #endif
 
diff --git a/apps/netutils/thttpd/timers.h b/apps/netutils/thttpd/timers.h
index 7c8f9f201..0b2d34451 100644
--- a/apps/netutils/thttpd/timers.h
+++ b/apps/netutils/thttpd/timers.h
@@ -41,7 +41,7 @@
  * Included Files
  ****************************************************************************/
 
-#include <time.h>
+#include <sys/time.h>
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/apps/netutils/webclient/webclient.c b/apps/netutils/webclient/webclient.c
index 389306ce9..7e876488a 100644
--- a/apps/netutils/webclient/webclient.c
+++ b/apps/netutils/webclient/webclient.c
@@ -55,6 +55,7 @@
 #endif
 
 #include <sys/socket.h>
+#include <sys/time.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdbool.h>
diff --git a/apps/netutils/webserver/httpd.c b/apps/netutils/webserver/httpd.c
index f177a51ea..bd7f3a092 100644
--- a/apps/netutils/webserver/httpd.c
+++ b/apps/netutils/webserver/httpd.c
@@ -49,6 +49,7 @@
 
 #include <sys/types.h>
 #include <sys/socket.h>
+#include <sys/time.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>