summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorguenther <guenther@openbsd.org>2015-01-20 03:55:18 +0000
committerguenther <guenther@openbsd.org>2015-01-20 03:55:18 +0000
commit951cc97263c1e0618bd95f7ec38d39dc6572ed25 (patch)
tree7e1bda8d4baf7772266a6cfcf29d075fd3d24259
parentBack out a chunk of rev 1.34 that wasn't supposed to go in with the (diff)
downloadwireguard-openbsd-951cc97263c1e0618bd95f7ec38d39dc6572ed25.tar.xz
wireguard-openbsd-951cc97263c1e0618bd95f7ec38d39dc6572ed25.zip
SELECT_FD_TYPE is obsolete
-rw-r--r--usr.bin/rdist/child.c5
-rw-r--r--usr.bin/rdist/config.h9
2 files changed, 3 insertions, 11 deletions
diff --git a/usr.bin/rdist/child.c b/usr.bin/rdist/child.c
index 504b386607e..1ba56ebe1d3 100644
--- a/usr.bin/rdist/child.c
+++ b/usr.bin/rdist/child.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: child.c,v 1.23 2014/07/05 07:57:43 guenther Exp $ */
+/* $OpenBSD: child.c,v 1.24 2015/01/20 03:55:18 guenther Exp $ */
/*
* Copyright (c) 1983 Regents of the University of California.
@@ -365,8 +365,7 @@ waitup(void)
debugmsg(DM_MISC, "waitup() Call select(), activechildren=%d\n",
activechildren);
- count = select(rchildfdsn+1, (SELECT_FD_TYPE *) rchildfdsp,
- NULL, NULL, NULL);
+ count = select(rchildfdsn+1, rchildfdsp, NULL, NULL, NULL);
debugmsg(DM_MISC, "waitup() select returned %d activechildren = %d\n",
count, activechildren);
diff --git a/usr.bin/rdist/config.h b/usr.bin/rdist/config.h
index 3d182911c7e..71a094bf23c 100644
--- a/usr.bin/rdist/config.h
+++ b/usr.bin/rdist/config.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: config.h,v 1.10 2014/07/12 03:32:00 guenther Exp $ */
+/* $OpenBSD: config.h,v 1.11 2015/01/20 03:55:18 guenther Exp $ */
/*
* Copyright (c) 1993 Michael A. Cooper
@@ -98,11 +98,4 @@
#define SL_NOTICE LOG_NOTICE /* General notices */
#define SL_DEBUG LOG_DEBUG /* Debugging */
-/*
- * Arg types to select(2)
- */
-#ifndef SELECT_FD_TYPE
-#define SELECT_FD_TYPE fd_set
-#endif
-
#endif /* __config_h__ */