diff options
author | Nick Withers <nick.withers@anu.edu.au> | 2015-12-10 20:01:52 +1100 |
---|---|---|
committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2016-01-18 14:59:52 +0100 |
commit | 4202a31f91ca3d19ca18f08730a4be52fb71cc04 (patch) | |
tree | 9e4b03d3e952f8a753b9ae954df7f78c34829052 /cpukit/libnetworking/sys | |
parent | doc: Update ARM floating-point support (diff) | |
download | rtems-4202a31f91ca3d19ca18f08730a4be52fb71cc04.tar.bz2 |
Chase Newlib sys/types.h / sys/select.h changes
Diffstat (limited to 'cpukit/libnetworking/sys')
-rw-r--r-- | cpukit/libnetworking/sys/selinfo.h (renamed from cpukit/libnetworking/sys/select.h) | 22 | ||||
-rw-r--r-- | cpukit/libnetworking/sys/socketvar.h | 2 |
2 files changed, 5 insertions, 19 deletions
diff --git a/cpukit/libnetworking/sys/select.h b/cpukit/libnetworking/sys/selinfo.h index 8a84e4cca6..68ec92a6a3 100644 --- a/cpukit/libnetworking/sys/select.h +++ b/cpukit/libnetworking/sys/selinfo.h @@ -10,10 +10,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -33,10 +29,10 @@ * @(#)select.h 8.2 (Berkeley) 1/4/94 */ -#ifndef _SYS_SELECT_H_ -#define _SYS_SELECT_H_ +#ifndef _SYS_SELINFO_H_ +#define _SYS_SELINFO_H_ -#include <sys/time.h> /* struct timeval */ +#include <sys/types.h> /* pid_t */ #ifdef __cplusplus extern "C" { @@ -52,18 +48,8 @@ struct selinfo { }; #define SI_COLL 0x0001 /* collision occurred */ -/* Check the first NFDS descriptors each in READFDS (if not NULL) for read - readiness, in WRITEFDS (if not NULL) for write readiness, and in EXCEPTFDS - (if not NULL) for exceptional conditions. If TIMEOUT is not NULL, time out - after waiting the interval specified therein. Returns the number of ready - descriptors, or -1 for errors. */ -extern int select (int __nfds, fd_set *__restrict __readfds, - fd_set *__restrict __writefds, - fd_set *__restrict __exceptfds, - struct timeval *__restrict __timeout); - #ifdef __cplusplus } #endif -#endif /* !_SYS_SELECT_H_ */ +#endif /* !_SYS_SELINFO_H_ */ diff --git a/cpukit/libnetworking/sys/socketvar.h b/cpukit/libnetworking/sys/socketvar.h index 09bb2a5f3b..13b3674746 100644 --- a/cpukit/libnetworking/sys/socketvar.h +++ b/cpukit/libnetworking/sys/socketvar.h @@ -34,7 +34,7 @@ #define _SYS_SOCKETVAR_H_ #include <sys/queue.h> /* for TAILQ macros */ -#include <sys/select.h> /* for struct selinfo */ +#include <sys/selinfo.h> /* for struct selinfo */ /* |