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 /nuttx/include/sys | |
parent | f885003829cabac6e8a2db65b318f897f25ff933 (diff) | |
download | px4-nuttx-8e1975393114d786b3699f926a416c3945ec3dfd.tar.gz px4-nuttx-8e1975393114d786b3699f926a416c3945ec3dfd.tar.bz2 px4-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 'nuttx/include/sys')
-rw-r--r-- | nuttx/include/sys/ioctl.h | 12 | ||||
-rw-r--r-- | nuttx/include/sys/sockio.h | 12 |
2 files changed, 12 insertions, 12 deletions
diff --git a/nuttx/include/sys/ioctl.h b/nuttx/include/sys/ioctl.h index 03c79ebef..73564dc5a 100644 --- a/nuttx/include/sys/ioctl.h +++ b/nuttx/include/sys/ioctl.h @@ -1,8 +1,8 @@ /**************************************************************************** * include/sys/ioctl.h * - * Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * Copyright (C) 2007, 2008, 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 @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __SYS_IOCTL_H -#define __SYS_IOCTL_H +#ifndef __INCLUDE_SYS_IOCTL_H +#define __INCLUDE_SYS_IOCTL_H /**************************************************************************** * Included Files @@ -48,7 +48,7 @@ /* Include network ioctls info */ #if defined(CONFIG_NET) && CONFIG_NSOCKET_DESCRIPTORS > 0 -# include <net/ioctls.h> +# include <nuttx/net/ioctl.h> #endif /**************************************************************************** @@ -80,4 +80,4 @@ EXTERN int ioctl(int fd, int req, unsigned long arg); } #endif -#endif /* __SYS_IOCTL_H */ +#endif /* __INCLUDE_SYS_IOCTL_H */ diff --git a/nuttx/include/sys/sockio.h b/nuttx/include/sys/sockio.h index a63833756..e69425926 100644 --- a/nuttx/include/sys/sockio.h +++ b/nuttx/include/sys/sockio.h @@ -1,8 +1,8 @@ /**************************************************************************** * include/sys/sockio.h * - * Copyright (C) 2010 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * Copyright (C) 2010, 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 @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __SYS_SOCKIO_H -#define __SYS_SOCKIO_H +#ifndef __INCLUDE_SYS_SOCKIO_H +#define __INCLUDE_SYS_SOCKIO_H /**************************************************************************** * Included Files @@ -44,7 +44,7 @@ #include <nuttx/config.h> #include <nuttx/ioctl.h> -#include <net/ioctls.h> +#include <nuttx/net/ioctl.h> /**************************************************************************** * Pre-Processor Definitions @@ -117,4 +117,4 @@ extern "C" { } #endif -#endif /* __SYS_SOCKIO_H */ +#endif /* __INCLUDE_SYS_SOCKIO_H */ |