From 12ea4a6f7a38b152cd4b52d9569a7edc8eec887c Mon Sep 17 00:00:00 2001
From: Simon Wilkinson <sxw@your-file-system.com>
Date: Fri, 25 Mar 2011 19:36:35 +0000
Subject: [PATCH] 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>
---
 acinclude.m4         |  1 +
 src/lwp/fasttime.c   | 10 +---------
 src/lwp/iomgr.c      | 24 ++++++------------------
 src/lwp/lock.c       |  4 ++--
 src/lwp/lwp.c        | 14 ++------------
 src/lwp/lwp_nt.c     |  3 +--
 src/lwp/preempt.c    |  3 +--
 src/lwp/process.c    |  7 ++-----
 src/lwp/rw.c         | 10 +---------
 src/lwp/threadname.c |  3 +--
 src/lwp/timer.c      |  8 +-------
 src/lwp/waitkey.c    | 11 +++--------
 12 files changed, 22 insertions(+), 76 deletions(-)

diff --git a/acinclude.m4 b/acinclude.m4
index 7452cbc..b7b0333 100644
--- 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 24e9751..0230184 100644
--- 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 561b07f..b0148ea 100644
--- 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 57c0617..d34bfb4 100644
--- 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 3e1290b..d7e599f 100644
--- 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 b2f9711..147a91a 100644
--- 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 0ca9b5f..d9e9ec0 100644
--- 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 bd18de6..75a7105 100644
--- 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 3710db4..03a14cd 100644
--- 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 62a967e..8c7e055 100644
--- 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 90fe67e..cad63b4 100644
--- 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 79b968e..11ef20b 100644
--- 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 */
-- 
1.9.4