[rtems commit] Chase Newlib sys/types.h / sys/select.h changes
Sebastian Huber
sebh at rtems.org
Mon Jan 18 14:00:39 UTC 2016
Module: rtems
Branch: master
Commit: 4202a31f91ca3d19ca18f08730a4be52fb71cc04
Changeset: http://git.rtems.org/rtems/commit/?id=4202a31f91ca3d19ca18f08730a4be52fb71cc04
Author: Nick Withers <nick.withers at anu.edu.au>
Date: Thu Dec 10 20:01:52 2015 +1100
Chase Newlib sys/types.h / sys/select.h changes
---
cpukit/libnetworking/Makefile.am | 2 +-
cpukit/libnetworking/libc/res_send.c | 3 +++
cpukit/libnetworking/preinstall.am | 6 +++---
cpukit/libnetworking/rtems/rtems_select.c | 1 +
cpukit/libnetworking/sys/{select.h => selinfo.h} | 22 ++++------------------
cpukit/libnetworking/sys/socketvar.h | 2 +-
cpukit/librpc/include/rpc/svc.h | 1 +
cpukit/librpc/src/rpc/clnt_tcp.c | 1 +
cpukit/librpc/src/rpc/clnt_udp.c | 1 +
cpukit/librpc/src/rpc/pmap_rmt.c | 1 +
cpukit/librpc/src/rpc/rpc_dtablesize.c | 2 +-
cpukit/librpc/src/rpc/svc.c | 1 +
12 files changed, 19 insertions(+), 24 deletions(-)
diff --git a/cpukit/libnetworking/Makefile.am b/cpukit/libnetworking/Makefile.am
index 927245b..2a8e06a 100644
--- a/cpukit/libnetworking/Makefile.am
+++ b/cpukit/libnetworking/Makefile.am
@@ -177,7 +177,7 @@ include_sys_HEADERS += sys/proc.h
include_sys_HEADERS += sys/protosw.h
include_sys_HEADERS += sys/reboot.h
include_sys_HEADERS += sys/resourcevar.h
-include_sys_HEADERS += sys/select.h
+include_sys_HEADERS += sys/selinfo.h
include_sys_HEADERS += sys/signalvar.h
include_sys_HEADERS += sys/socket.h
include_sys_HEADERS += sys/socketvar.h
diff --git a/cpukit/libnetworking/libc/res_send.c b/cpukit/libnetworking/libc/res_send.c
index b1dc337..316d3ad 100644
--- a/cpukit/libnetworking/libc/res_send.c
+++ b/cpukit/libnetworking/libc/res_send.c
@@ -79,6 +79,9 @@
#include <sys/types.h>
#include <sys/param.h>
#include <sys/time.h>
+#ifndef NOSELECT
+#include <sys/select.h>
+#endif
#include <sys/socket.h>
#include <sys/uio.h>
diff --git a/cpukit/libnetworking/preinstall.am b/cpukit/libnetworking/preinstall.am
index bff9065..477b19a 100644
--- a/cpukit/libnetworking/preinstall.am
+++ b/cpukit/libnetworking/preinstall.am
@@ -367,9 +367,9 @@ $(PROJECT_INCLUDE)/sys/resourcevar.h: sys/resourcevar.h $(PROJECT_INCLUDE)/sys/$
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/resourcevar.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/resourcevar.h
-$(PROJECT_INCLUDE)/sys/select.h: sys/select.h $(PROJECT_INCLUDE)/sys/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/select.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/select.h
+$(PROJECT_INCLUDE)/sys/selinfo.h: sys/selinfo.h $(PROJECT_INCLUDE)/sys/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/selinfo.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/selinfo.h
$(PROJECT_INCLUDE)/sys/signalvar.h: sys/signalvar.h $(PROJECT_INCLUDE)/sys/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/signalvar.h
diff --git a/cpukit/libnetworking/rtems/rtems_select.c b/cpukit/libnetworking/rtems/rtems_select.c
index 05c8951..eddb122 100644
--- a/cpukit/libnetworking/rtems/rtems_select.c
+++ b/cpukit/libnetworking/rtems/rtems_select.c
@@ -17,6 +17,7 @@
#include <sys/types.h>
#include <sys/param.h>
#include <sys/mbuf.h>
+#include <sys/select.h>
#include <sys/socket.h>
#include <sys/socketvar.h>
#include <sys/protosw.h>
diff --git a/cpukit/libnetworking/sys/select.h b/cpukit/libnetworking/sys/selinfo.h
similarity index 68%
rename from cpukit/libnetworking/sys/select.h
rename to cpukit/libnetworking/sys/selinfo.h
index 8a84e4c..68ec92a 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 09bb2a5..13b3674 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 */
/*
diff --git a/cpukit/librpc/include/rpc/svc.h b/cpukit/librpc/include/rpc/svc.h
index 0ef3b8c..0808ddd 100644
--- a/cpukit/librpc/include/rpc/svc.h
+++ b/cpukit/librpc/include/rpc/svc.h
@@ -43,6 +43,7 @@
#include <sys/cdefs.h>
#include <rpc/types.h>
#include <rpc/xdr.h> /* xdrproc_t */
+#include <sys/select.h> /* fd_set */
#include <sys/socket.h> /* socklen_t */
#include <netinet/in.h> /* struct sockaddr_in */
#include <rpc/auth.h> /* auth_stat */
diff --git a/cpukit/librpc/src/rpc/clnt_tcp.c b/cpukit/librpc/src/rpc/clnt_tcp.c
index f53edae..c85531d 100644
--- a/cpukit/librpc/src/rpc/clnt_tcp.c
+++ b/cpukit/librpc/src/rpc/clnt_tcp.c
@@ -61,6 +61,7 @@ static char *rcsid = "$FreeBSD: src/lib/libc/rpc/clnt_tcp.c,v 1.14 2000/01/27 23
#include <unistd.h>
#include <string.h>
#include <rpc/rpc.h>
+#include <sys/param.h>
#include <sys/socket.h>
#include <netdb.h>
#include <errno.h>
diff --git a/cpukit/librpc/src/rpc/clnt_udp.c b/cpukit/librpc/src/rpc/clnt_udp.c
index 68e085e..e48508b 100644
--- a/cpukit/librpc/src/rpc/clnt_udp.c
+++ b/cpukit/librpc/src/rpc/clnt_udp.c
@@ -48,6 +48,7 @@ static char *rcsid = "$FreeBSD: src/lib/libc/rpc/clnt_udp.c,v 1.15 2000/01/27 23
#include <unistd.h>
#include <string.h>
#include <rpc/rpc.h>
+#include <sys/param.h>
#include <sys/socket.h>
#include <sys/ioctl.h>
#include <netdb.h>
diff --git a/cpukit/librpc/src/rpc/pmap_rmt.c b/cpukit/librpc/src/rpc/pmap_rmt.c
index 1ab72b2..c7d36b0 100644
--- a/cpukit/librpc/src/rpc/pmap_rmt.c
+++ b/cpukit/librpc/src/rpc/pmap_rmt.c
@@ -46,6 +46,7 @@ static char *rcsid = "$FreeBSD: src/lib/libc/rpc/pmap_rmt.c,v 1.15 2000/01/27 23
#endif
#include <sys/ioctl.h>
+#include <sys/param.h>
#include <sys/socket.h>
#include <net/if.h>
diff --git a/cpukit/librpc/src/rpc/rpc_dtablesize.c b/cpukit/librpc/src/rpc/rpc_dtablesize.c
index 65f2953..a102acc 100644
--- a/cpukit/librpc/src/rpc/rpc_dtablesize.c
+++ b/cpukit/librpc/src/rpc/rpc_dtablesize.c
@@ -37,7 +37,7 @@ static char *rcsid = "$FreeBSD: src/lib/libc/rpc/rpc_dtablesize.c,v 1.10 1999/08
#include "config.h"
#endif
-#include <sys/types.h>
+#include <sys/select.h>
#include <unistd.h>
/*
diff --git a/cpukit/librpc/src/rpc/svc.c b/cpukit/librpc/src/rpc/svc.c
index 9cc5cf3..64cc964 100644
--- a/cpukit/librpc/src/rpc/svc.c
+++ b/cpukit/librpc/src/rpc/svc.c
@@ -53,6 +53,7 @@ static char *rcsid = "$FreeBSD: src/lib/libc/rpc/svc.c,v 1.14 1999/08/28 00:00:4
#endif
#include <stdlib.h>
#include <sys/errno.h>
+#include <sys/param.h>
#include <rpc/rpc.h>
#include <rpc/pmap_clnt.h>
More information about the vc
mailing list