libwp: Tidy header includes

Remove headers which are provided by libroken, and reorder header
includes so that they're a bit a more legible.

Change-Id: I4952f8d115d38a3bd1dfe86478cd4a30f533e86f
Reviewed-on: http://gerrit.openafs.org/4386
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: BuildBot <buildbot@rampaginggeek.com>

diff --git a/acinclude.m4 b/acinclude.m4
index 7452cbccd3f40e1bd5169421de1bf06470c66b53..b7b03335eb0b082fd5b052ff23c74cd88cf0ef17 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1254,6 +1254,7 @@ AC_CHECK_HEADERS([ \
                   sys/pag.h \
                   sys/param.h \
                   sys/resource.h \
+                  sys/select.h \
                   sys/statfs.h \
                   sys/statvfs.h \
                   sys/socket.h \

diff --git a/src/lwp/fasttime.c b/src/lwp/fasttime.c
index 24e9751df6ea7d2f99d8322a5ec0a040e957b35d..02301848caaf9dbfe89b23e3787655bc9f2c187b 100644 (file)
--- a/src/lwp/fasttime.c
+++ b/src/lwp/fasttime.c
@@ -26,16 +26,8 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
-#include <stdio.h>
-#include <sys/types.h>
-#ifdef AFS_NT40_ENV
-#include <sys/timeb.h>
-#include <winsock2.h>
-#else
-#include <sys/time.h>
-#include <sys/file.h>
-#endif
 #include <afs/afsutil.h>
 
 int ft_debug;

diff --git a/src/lwp/iomgr.c b/src/lwp/iomgr.c
index 561b07fc0a5299cd6bd257fee95204e7ef5762cc..b0148ea44195756639016665d33ccb8420f8fb60 100644 (file)
--- a/src/lwp/iomgr.c
+++ b/src/lwp/iomgr.c
@@ -36,30 +36,18 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 #ifdef AFS_NT40_ENV
-#include <winsock2.h>
-#include <malloc.h>
 extern void lwp_abort(void);
-#else
-#include <unistd.h>            /* select() prototype */
-#include <sys/types.h>         /* fd_set on older platforms */
-#include <sys/time.h>          /* struct timeval, select() prototype */
-#ifndef FD_SET
-# include <sys/select.h>       /* fd_set on newer platforms */
-#endif
-#include <sys/file.h>
 #endif /* AFS_NT40_ENV */
+
+#ifdef HAVE_SYS_SELECT_H
+#include <sys/select.h>
+#endif
+
 #include "lwp.h"
 #include "timer.h"
-#include <signal.h>
-#include <errno.h>
-#ifdef AFS_SUN5_ENV
-#include <fcntl.h>
-#endif
 
 typedef unsigned char bool;
 #define FALSE  0

diff --git a/src/lwp/lock.c b/src/lwp/lock.c
index 57c0617c74eff42058a4a2582386d038cf5da459..d34bfb438a978d5f0ccf9e965ffe648806f967a5 100644 (file)
--- a/src/lwp/lock.c
+++ b/src/lwp/lock.c
@@ -25,11 +25,12 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
+
 #ifdef AFS_PTHREAD_ENV
 #include <afs/afs_assert.h>
 /* can't include this in lwp, rx hasn't built yet */
 
-#include <roken.h>
 #include <rx/rx.h>
 #else
 #include <assert.h>
@@ -37,7 +38,6 @@
 
 #include "lwp.h"
 #include "lock.h"
-#include <stdio.h>
 
 #define FALSE  0
 #define TRUE   1

diff --git a/src/lwp/lwp.c b/src/lwp/lwp.c
index 3e1290b2b1705396cd4c20ad940e08754fe40402..d7e599fe5cd283791f8b5348cb1c350fa493eefd 100644 (file)
--- a/src/lwp/lwp.c
+++ b/src/lwp/lwp.c
@@ -17,17 +17,12 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
-
-#include <stdlib.h>
-#include <stdio.h>
-#ifdef HAVE_STDINT_H
-#include <stdint.h>
-#endif
-#include <time.h>
+#include <roken.h>
 
 /* allocate externs here */
 #define  LWP_KERNEL
 #include "lwp.h"
+
 #ifdef AFS_AIX32_ENV
 #include <ulimit.h>
 #include <sys/errno.h>
@@ -37,11 +32,6 @@
 #pragma alloca
 int setlim(int limcon, uchar_t hard, int limit);
 #endif
-#ifdef AFS_SGI64_ENV
-extern char *getenv();
-#include <time.h>
-#endif
-#include <string.h>
 
 #ifndef AFS_ARM_LINUX20_ENV
 #if defined(AFS_OSF_ENV) || defined(AFS_S390_LINUX20_ENV)

diff --git a/src/lwp/lwp_nt.c b/src/lwp/lwp_nt.c
index b2f9711720680284c063924f3671870aa07e8300..147a91a2bd826fa00d14a2b92bd24b29d980f7f0 100644 (file)
--- a/src/lwp/lwp_nt.c
+++ b/src/lwp/lwp_nt.c
@@ -19,10 +19,9 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
 #ifdef AFS_NT40_ENV
-#include <stdio.h>
-#include <stdlib.h>
 #include <afs/afsutil.h>
 #include "lwp.h"
 

diff --git a/src/lwp/preempt.c b/src/lwp/preempt.c
index 0ca9b5fea57fa6c70cc64106f32a8ef81ae7d832..d9e9ec0722211b3df9c79a071642587f276e257a 100644 (file)
--- a/src/lwp/preempt.c
+++ b/src/lwp/preempt.c
@@ -16,6 +16,7 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
 
 #include "lwp.h"
@@ -38,8 +39,6 @@ PRE_EndPreempt(void)
 }
 
 #else
-#include <sys/time.h>
-#include <signal.h>
 #ifdef HAVE_UCONTEXT_H
 #include <ucontext.h>
 #endif

diff --git a/src/lwp/process.c b/src/lwp/process.c
index bd18de6e04824729dc1d7a2e80377e28a7719e7e..75a71058bf1bfd9aeffb7cc50e4179835284cd2a 100644 (file)
--- a/src/lwp/process.c
+++ b/src/lwp/process.c
@@ -12,12 +12,9 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
-#include <stdio.h>
-#include <assert.h>
-#ifdef HAVE_STDLIB_H
-# include <stdlib.h>
-#endif
+#include <roken.h>
 
+#include <assert.h>
 
 #include "lwp.h"
 

diff --git a/src/lwp/rw.c b/src/lwp/rw.c
index 3710db43d01141f54074e631efb2db5464697b99..03a14cd36c8474ca76f5a993529c01c737909c41 100644 (file)
--- a/src/lwp/rw.c
+++ b/src/lwp/rw.c
@@ -17,15 +17,7 @@ Created: 11/1/83, J. Rosenberg
 #include <afsconfig.h>
 #include <afs/param.h>
 
-
-#ifdef AFS_NT40_ENV
-#include <malloc.h>
-#include <stdlib.h>
-#else
-#include <sys/time.h>
-#endif
-#include <stdio.h>
-#include <stdlib.h>
+#include <roken.h>
 
 #include "lwp.h"
 #include "lock.h"

diff --git a/src/lwp/threadname.c b/src/lwp/threadname.c
index 62a967e0035c088ed3586c63f944296226835cc1..8c7e055c47144411a1b95e171b1b41396b2e221b 100644 (file)
--- a/src/lwp/threadname.c
+++ b/src/lwp/threadname.c
@@ -22,8 +22,7 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
-
-#include <string.h>
+#include <roken.h>
 
 #if defined(AFS_PTHREAD_ENV)
 #include <pthread.h>

diff --git a/src/lwp/timer.c b/src/lwp/timer.c
index 90fe67e0c7c3bb47e901448c6141f36c2ba3dbe9..cad63b4a3a0599843af4005797c5d6644852b38f 100644 (file)
--- a/src/lwp/timer.c
+++ b/src/lwp/timer.c
@@ -21,13 +21,7 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
-
-#ifdef AFS_NT40_ENV
-#include <winsock2.h>
-#else
-#include <sys/time.h>
-#endif
-#include <stdlib.h>
+#include <roken.h>
 
 #define _TIMER_IMPL_
 #include "timer.h"

diff --git a/src/lwp/waitkey.c b/src/lwp/waitkey.c
index 79b968e48a5a2413b04e97f7eeae4244e8cc7671..11ef20b8d656dcd6fe7d72e16663eff342856055 100644 (file)
--- a/src/lwp/waitkey.c
+++ b/src/lwp/waitkey.c
@@ -22,21 +22,16 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
-#include <stdio.h>
 #ifdef HAVE_STDIO_EXT_H
 #include <stdio_ext.h>
 #endif
-#include <sys/types.h>
+
 #ifdef AFS_NT40_ENV
-#include <time.h>
 #include <conio.h>
-#include <assert.h>
-#else
-#include <sys/time.h>
-#include <unistd.h>
 #endif
-#include <string.h>
+
 #include "lwp.h"
 
 #define LWP_KEYSTROKE_DELAY   250      /* 250ms. Must be < 1000 */