diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-03-03 23:18:34 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-03-03 23:18:34 +0000 |
commit | 8e1975393114d786b3699f926a416c3945ec3dfd (patch) | |
tree | 836687c8a01c9ab067c477767811699a0584323f /apps/netutils | |
parent | f885003829cabac6e8a2db65b318f897f25ff933 (diff) | |
download | nuttx-8e1975393114d786b3699f926a416c3945ec3dfd.tar.gz nuttx-8e1975393114d786b3699f926a416c3945ec3dfd.tar.bz2 nuttx-8e1975393114d786b3699f926a416c3945ec3dfd.zip |
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
Diffstat (limited to 'apps/netutils')
-rw-r--r-- | apps/netutils/dhcpc/dhcpc.c | 2 | ||||
-rw-r--r-- | apps/netutils/dhcpd/dhcpd.c | 2 | ||||
-rw-r--r-- | apps/netutils/ftpc/ftpc_login.c | 5 | ||||
-rw-r--r-- | apps/netutils/smtp/smtp.c | 2 | ||||
-rw-r--r-- | apps/netutils/telnetd/telnetd_driver.c | 5 | ||||
-rw-r--r-- | apps/netutils/tftpc/tftpc_get.c | 4 | ||||
-rw-r--r-- | apps/netutils/tftpc/tftpc_internal.h | 2 | ||||
-rw-r--r-- | apps/netutils/tftpc/tftpc_packets.c | 4 | ||||
-rw-r--r-- | apps/netutils/tftpc/tftpc_put.c | 4 | ||||
-rw-r--r-- | apps/netutils/uiplib/uiplib.c | 2 | ||||
-rw-r--r-- | apps/netutils/webserver/httpd.c | 2 | ||||
-rw-r--r-- | apps/netutils/webserver/httpd.h | 4 | ||||
-rw-r--r-- | apps/netutils/webserver/httpd_cgi.c | 2 | ||||
-rw-r--r-- | apps/netutils/webserver/httpd_fsdata.h | 2 |
14 files changed, 19 insertions, 23 deletions
diff --git a/apps/netutils/dhcpc/dhcpc.c b/apps/netutils/dhcpc/dhcpc.c index 4e59d2371..9801242fe 100644 --- a/apps/netutils/dhcpc/dhcpc.c +++ b/apps/netutils/dhcpc/dhcpc.c @@ -52,7 +52,7 @@ #include <errno.h> #include <debug.h> -#include <net/uip/uip.h> +#include <nuttx/net/uip/uip.h> #include <apps/netutils/dhcpc.h> #include <apps/netutils/uiplib.h> diff --git a/apps/netutils/dhcpd/dhcpd.c b/apps/netutils/dhcpd/dhcpd.c index 6c14c6196..d9143288d 100644 --- a/apps/netutils/dhcpd/dhcpd.c +++ b/apps/netutils/dhcpd/dhcpd.c @@ -56,7 +56,7 @@ # include <debug.h> /* For ndbg, vdbg */ # include <nuttx/compiler.h> /* For CONFIG_CPP_HAVE_WARNING */ # include <arch/irq.h> /* For irqstore() and friends -- REVISIT */ -# include <net/uip/uip-arp.h> /* For low-level ARP interfaces -- REVISIT */ +# include <nuttx/net/uip/uip-arp.h> /* For low-level ARP interfaces -- REVISIT */ # include <apps/netutils/dhcpd.h> /* Advertised DHCPD APIs */ #endif diff --git a/apps/netutils/ftpc/ftpc_login.c b/apps/netutils/ftpc/ftpc_login.c index be899a074..3d41d8a25 100644 --- a/apps/netutils/ftpc/ftpc_login.c +++ b/apps/netutils/ftpc/ftpc_login.c @@ -1,8 +1,8 @@ /**************************************************************************** * apps/netutils/ftpc/ftpc_login.c * - * Copyright (C) 2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * Copyright (C) 2011-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 @@ -145,7 +145,6 @@ errout: int ftpc_relogin(FAR struct ftpc_session_s *session) { - int err; int ret; /* Log into the server. First send the USER command. The server may accept diff --git a/apps/netutils/smtp/smtp.c b/apps/netutils/smtp/smtp.c index d758c6f6b..4e66a41cb 100644 --- a/apps/netutils/smtp/smtp.c +++ b/apps/netutils/smtp/smtp.c @@ -57,7 +57,7 @@ #include <semaphore.h> #include <sys/socket.h> -#include <net/uip/uip.h> +#include <nuttx/net/uip/uip.h> #include <apps/netutils/smtp.h> /**************************************************************************** diff --git a/apps/netutils/telnetd/telnetd_driver.c b/apps/netutils/telnetd/telnetd_driver.c index eb43012c4..2efaba1be 100644 --- a/apps/netutils/telnetd/telnetd_driver.c +++ b/apps/netutils/telnetd/telnetd_driver.c @@ -1,9 +1,6 @@ /**************************************************************************** * apps/netutils/telnetd_driver.c * - * Copyright (C) 2008-2 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt <gnutt@nuttx.org> - * * Copyright (C) 2007, 2009, 2011-2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> * @@ -62,7 +59,7 @@ #include <nuttx/fs.h> #include <debug.h> -#include <nuttx/net.h> +#include <nuttx/net/net.h> #include <apps/netutils/telnetd.h> #include <apps/netutils/uiplib.h> diff --git a/apps/netutils/tftpc/tftpc_get.c b/apps/netutils/tftpc/tftpc_get.c index b2170ec39..4f391806c 100644 --- a/apps/netutils/tftpc/tftpc_get.c +++ b/apps/netutils/tftpc/tftpc_get.c @@ -49,8 +49,8 @@ #include <errno.h> #include <debug.h> -#include <net/uip/uipopt.h> -#include <net/uip/uip.h> +#include <nuttx/net/uip/uipopt.h> +#include <nuttx/net/uip/uip.h> #include <apps/netutils/tftp.h> #include "tftpc_internal.h" diff --git a/apps/netutils/tftpc/tftpc_internal.h b/apps/netutils/tftpc/tftpc_internal.h index ffaecdb13..bed25a6a5 100644 --- a/apps/netutils/tftpc/tftpc_internal.h +++ b/apps/netutils/tftpc/tftpc_internal.h @@ -47,7 +47,7 @@ #include <stdint.h> #include <stdbool.h> -#include <net/uip/uipopt.h> +#include <nuttx/net/uip/uipopt.h> /**************************************************************************** * Pre-processor Definitions diff --git a/apps/netutils/tftpc/tftpc_packets.c b/apps/netutils/tftpc/tftpc_packets.c index d1370efd8..7d172e659 100644 --- a/apps/netutils/tftpc/tftpc_packets.c +++ b/apps/netutils/tftpc/tftpc_packets.c @@ -51,8 +51,8 @@ #include <netinet/in.h> -#include <net/uip/uipopt.h> -#include <net/uip/uip.h> +#include <nuttx/net/uip/uipopt.h> +#include <nuttx/net/uip/uip.h> #include <apps/netutils/tftp.h> #include "tftpc_internal.h" diff --git a/apps/netutils/tftpc/tftpc_put.c b/apps/netutils/tftpc/tftpc_put.c index b36599718..7124bb981 100644 --- a/apps/netutils/tftpc/tftpc_put.c +++ b/apps/netutils/tftpc/tftpc_put.c @@ -49,8 +49,8 @@ #include <errno.h> #include <debug.h> -#include <net/uip/uipopt.h> -#include <net/uip/uip.h> +#include <nuttx/net/uip/uipopt.h> +#include <nuttx/net/uip/uip.h> #include <apps/netutils/tftp.h> #include "tftpc_internal.h" diff --git a/apps/netutils/uiplib/uiplib.c b/apps/netutils/uiplib/uiplib.c index 99f716f5c..5e4fc4e18 100644 --- a/apps/netutils/uiplib/uiplib.c +++ b/apps/netutils/uiplib/uiplib.c @@ -46,7 +46,7 @@ #include <stdint.h> #include <stdbool.h> -#include <net/uip/uip.h> +#include <nuttx/net/uip/uip.h> #include <apps/netutils/uiplib.h> /**************************************************************************** diff --git a/apps/netutils/webserver/httpd.c b/apps/netutils/webserver/httpd.c index bf03a8094..0d8386bc5 100644 --- a/apps/netutils/webserver/httpd.c +++ b/apps/netutils/webserver/httpd.c @@ -58,7 +58,7 @@ #include <errno.h> #include <debug.h> -#include <net/uip/uip.h> +#include <nuttx/net/uip/uip.h> #include <apps/netutils/uiplib.h> #include <apps/netutils/httpd.h> diff --git a/apps/netutils/webserver/httpd.h b/apps/netutils/webserver/httpd.h index 52073765c..88e326f70 100644 --- a/apps/netutils/webserver/httpd.h +++ b/apps/netutils/webserver/httpd.h @@ -46,8 +46,8 @@ #include <nuttx/config.h> #include <stdint.h> -#include <net/uip/uip.h> -#include <net/uip/uipopt.h> +#include <nuttx/net/uip/uip.h> +#include <nuttx/net/uip/uipopt.h> /**************************************************************************** * Pre-processor Definitions diff --git a/apps/netutils/webserver/httpd_cgi.c b/apps/netutils/webserver/httpd_cgi.c index 967ef9b9c..4a6f871f8 100644 --- a/apps/netutils/webserver/httpd_cgi.c +++ b/apps/netutils/webserver/httpd_cgi.c @@ -42,7 +42,7 @@ #include <nuttx/compiler.h> -#include <net/uip/uip.h> +#include <nuttx/net/uip/uip.h> #include <apps/netutils/httpd.h> #include "httpd_cgi.h" diff --git a/apps/netutils/webserver/httpd_fsdata.h b/apps/netutils/webserver/httpd_fsdata.h index d0a69affa..c25ea0c86 100644 --- a/apps/netutils/webserver/httpd_fsdata.h +++ b/apps/netutils/webserver/httpd_fsdata.h @@ -44,7 +44,7 @@ ****************************************************************************/ #include <stdint.h> -#include <net/uip/uip.h> +#include <nuttx/net/uip/uip.h> /**************************************************************************** * Public Types |