Move all non-standard, NuttX header files into include/nuttx/net

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4450 42af7a65-404d-4744-a932-0658087f49c3

9 files changed, 15 insertions, 15 deletions

diff --git a/apps/examples/ftpc/ftpc_main.c b/apps/examples/ftpc/ftpc_main.c
index 9093b0c10..866a69cdb 100644
--- a/apps/examples/ftpc/ftpc_main.c
+++ b/apps/examples/ftpc/ftpc_main.c
@@ -295,7 +295,7 @@ static int ftpc_execute(SESSION handle, int argc, char *argv[])
 
 int ftpc_parse(SESSION handle, char *cmdline)
 {
-  FAR char *argv[FTPC_MAX_ARGUMENTS];
+  FAR char *argv[FTPC_MAX_ARGUMENTS+1];
   FAR char *saveptr;
   FAR char *cmd;
   int       argc;
diff --git a/apps/examples/igmp/igmp.c b/apps/examples/igmp/igmp.c
index 7f2a8099c..5b7ff8376 100644
--- a/apps/examples/igmp/igmp.c
+++ b/apps/examples/igmp/igmp.c
@@ -45,7 +45,7 @@
 #include <debug.h>
 
 #include <net/if.h>
-#include <net/uip/uip.h>
+#include <nuttx/net/uip/uip.h>
 #include <apps/netutils/uiplib.h>
 #include <apps/netutils/ipmsfilter.h>
 
diff --git a/apps/examples/nettest/nettest.c b/apps/examples/nettest/nettest.c
index 7160e693a..34ae48f2e 100644
--- a/apps/examples/nettest/nettest.c
+++ b/apps/examples/nettest/nettest.c
@@ -44,7 +44,7 @@
 #include <debug.h>
 
 #include <net/if.h>
-#include <net/uip/uip.h>
+#include <nuttx/net/uip/uip.h>
 #include <apps/netutils/uiplib.h>
 
 #include "nettest.h"
diff --git a/apps/examples/thttpd/content/netstat/netstat.c b/apps/examples/thttpd/content/netstat/netstat.c
index 634146274..61590ab29 100755
--- a/apps/examples/thttpd/content/netstat/netstat.c
+++ b/apps/examples/thttpd/content/netstat/netstat.c
@@ -44,8 +44,8 @@
 #include <unistd.h>
 
 #include <netinet/ether.h>
-#include <net/uip/uipopt.h>
-#include <net/uip/uip-arch.h>
+#include <nuttx/net/uip/uipopt.h>
+#include <nuttx/net/uip/uip-arch.h>
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/apps/examples/thttpd/main.c b/apps/examples/thttpd/main.c
index be30876cb..30c13bb00 100644
--- a/apps/examples/thttpd/main.c
+++ b/apps/examples/thttpd/main.c
@@ -1,8 +1,8 @@
 /****************************************************************************
  * examples/thttpd/main.c
  *
- *   Copyright (C) 2009-2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Copyright (C) 2009-2012 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
   * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -51,7 +51,7 @@
 #include <net/if.h>
 #include <netinet/ether.h>
 
-#include <net/uip/uip-arp.h>
+#include <nuttx/net/uip/uip-arp.h>
 #include <apps/netutils/uiplib.h>
 #include <apps/netutils/thttpd.h>
 
@@ -59,7 +59,7 @@
 #include <nuttx/binfmt.h>
 #include <nuttx/nxflat.h>
 #ifdef CONFIG_NET_SLIP
-#  include <nuttx/net.h>
+#  include <nuttx/net/net.h>
 #endif
 
 #include "content/romfs.h"
diff --git a/apps/examples/udp/target.c b/apps/examples/udp/target.c
index 07fec0e75..defbc7e05 100644
--- a/apps/examples/udp/target.c
+++ b/apps/examples/udp/target.c
@@ -41,7 +41,7 @@
 #include <stdio.h>
 #include <debug.h>
 
-#include <net/uip/uip.h>
+#include <nuttx/net/uip/uip.h>
 #include <apps/netutils/uiplib.h>
 
 #include "udp-internal.h"
diff --git a/apps/examples/uip/main.c b/apps/examples/uip/main.c
index fd2da4b8e..e4ba6dfdb 100644
--- a/apps/examples/uip/main.c
+++ b/apps/examples/uip/main.c
@@ -54,8 +54,8 @@
 #include <debug.h>
 
 #include <net/if.h>
-#include <net/uip/uip.h>
-#include <net/uip/uip-arp.h>
+#include <nuttx/net/uip/uip.h>
+#include <nuttx/net/uip/uip-arp.h>
 
 #include <apps/netutils/uiplib.h>
 
diff --git a/apps/examples/wget/target.c b/apps/examples/wget/target.c
index 9c55746b3..542220162 100644
--- a/apps/examples/wget/target.c
+++ b/apps/examples/wget/target.c
@@ -46,7 +46,7 @@
 #include <arpa/inet.h>
 #include <net/if.h>
 
-#include <net/uip/uip.h>
+#include <nuttx/net/uip/uip.h>
 
 #include <apps/netutils/uiplib.h>
 #include <apps/netutils/resolv.h>
diff --git a/apps/examples/wlan/wlan_main.c b/apps/examples/wlan/wlan_main.c
index 04210909a..585878730 100644
--- a/apps/examples/wlan/wlan_main.c
+++ b/apps/examples/wlan/wlan_main.c
@@ -57,8 +57,8 @@
 #include <nuttx/usb/usbhost.h>
 
 #include <net/if.h>
-#include <net/uip/uip.h>
-#include <net/uip/uip-arp.h>
+#include <nuttx/net/uip/uip.h>
+#include <nuttx/net/uip/uip-arp.h>
 
 #include <apps/netutils/uiplib.h>