Header cleanup.

svn path=/trunk/; revision=463

diff --git a/configure.in b/configure.in
index 2c5f573deafb8ad315cb29838a6cf1d593a96955..ee435b1d6c2300177ae4bedb81d7e5f15aa6da04 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -86,8 +86,8 @@ AC_TRY_COMPILE([],
  [AC_DEFINE(HAVE_PROTOTYPES) AC_MSG_RESULT(yes)],
  AC_MSG_RESULT(no))
                 
-dnl Check out the wait reality.
-AC_CHECK_HEADERS(sys/wait.h) AC_CHECK_FUNCS(waitpid wait3)
+dnl Check out the wait reality.  We have to assume sys/wait.h is present.
+AC_CHECK_FUNCS(waitpid wait3)
 AC_MSG_CHECKING(for union wait);
 AC_TRY_LINK([#include <sys/types.h>
 #include <sys/wait.h>],

diff --git a/daemon.c b/daemon.c
index ead2364127bd102d712ceb42ef3b67dc5074f4c6..2995f1ef48ad965b51e7d040d1f175f7dd89518a 100644 (file)
--- a/daemon.c
+++ b/daemon.c
@@ -7,18 +7,14 @@
 #include <config.h>
 
 #include <stdio.h>
+#include <signal.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/file.h>
-#include <signal.h>
-#include <fcntl.h>
-
-#if defined(HAVE_SYS_WAIT_H)
-#  include <sys/wait.h>
-#endif
+#include <sys/wait.h>
 
 #if defined(HAVE_UNISTD_H)
-#  include <unistd.h>
+#include <unistd.h>
 #endif
 
 #if defined(STDC_HEADERS)
@@ -26,7 +22,7 @@
 #endif
 
 #if defined(QNX)
-#  include <unix.h>
+#include <unix.h>
 #endif
 
 /* BSD portability hack */

diff --git a/driver.c b/driver.c
index a8284a3042defdfa9ff50116857d942e5a1a2a5c..84e557f3da1d482917f2afdf711ca541f42d1100 100644 (file)
--- a/driver.c
+++ b/driver.c
@@ -10,9 +10,9 @@
 #include  <stdio.h>
 #include  <setjmp.h>
 #include  <ctype.h>
+#include  <string.h>
 #if defined(STDC_HEADERS)
 #include  <stdlib.h>
-#include  <string.h>
 #endif
 #if defined(HAVE_UNISTD_H)
 #include <unistd.h>

diff --git a/fetchmail.c b/fetchmail.c
index 7d54fd7d9cac0a12cfdaf1cc74a9cb2732339e5e..90a82c8518cf9f59ea7752782a0d2b4751b11773 100644 (file)
--- a/fetchmail.c
+++ b/fetchmail.c
@@ -5,29 +5,18 @@
  */
 
 #include <config.h>
-#include <stdio.h>
-#include <ctype.h>
-#include <time.h>
 
+#include <stdio.h>
 #if defined(STDC_HEADERS)
 #include <stdlib.h>
-#include <string.h>
 #endif
-
 #if defined(HAVE_UNISTD_H)
 #include <unistd.h>
 #endif
-
+#include <string.h>
 #include <signal.h>
 #include <pwd.h>
-#include <errno.h>
-
-#include <sys/types.h>
-#include <sys/file.h>
-#include <sys/wait.h>
-#include <sys/stat.h>
 #include <sys/time.h>
-#include <fcntl.h>
 
 #ifdef HAVE_GETHOSTBYNAME
 #include <netdb.h>

diff --git a/options.c b/options.c
index f60747d9b6e415b9f97c17c43e0d00c282dc2b87..31ca26eb3337c2fde27ff80e7e248e2b52a4b5df 100644 (file)
--- a/options.c
+++ b/options.c
@@ -5,7 +5,7 @@
  */
 
 #include <config.h>
-#include <stdio.h>
+
 #include <pwd.h>
 #include <string.h>
 #if defined(STDC_HEADERS)

diff --git a/pop3.c b/pop3.c
index 0960085dca5bc4b321add60b7dffeb944ec9b08f..4df8473a1d630cee69de6273a4df46bf41517e3f 100644 (file)
--- a/pop3.c
+++ b/pop3.c
@@ -5,9 +5,9 @@
  */
 
 #include  <config.h>
+
 #include  <stdio.h>
 #include  <string.h>
-#include  <ctype.h>
 #if defined(HAVE_UNISTD_H)
 #include <unistd.h>
 #endif

diff --git a/smtp.c b/smtp.c
index 475b847af6deaceaf678f15a0ef6f70a8424ec08..f1908f81063a64cddfe56eb43ab1e8e018e425bb 100644 (file)
--- a/smtp.c
+++ b/smtp.c
@@ -9,9 +9,8 @@
  * For license terms, see the file COPYING in this directory.
  */
 
-#include <stdio.h>
 #include <config.h>
-#include <sys/types.h>
+#include <stdio.h>
 #include <unistd.h>
 #include <string.h>
 #include "socket.h"

diff --git a/socket.c b/socket.c
index 7a98f83fbc6c091ab2cc2a880b2a977cf35e83a4..f0020adf777c23edffd63b55976df5da5c808b70 100644 (file)
--- a/socket.c
+++ b/socket.c
@@ -7,14 +7,11 @@
 #include <config.h>
 
 #include <stdio.h>
-#include <fcntl.h>
 #include <sys/types.h>
 #include <sys/socket.h>
-#include <netinet/in.h>
 #include <arpa/inet.h>
 #include <netdb.h>
 #if defined(STDC_HEADERS)
-#include <string.h>
 #include <stdlib.h>
 #endif
 #if defined(HAVE_UNISTD_H)
@@ -25,7 +22,6 @@
 #else
 #include <varargs.h>
 #endif
-#include <errno.h>
 #include "socket.h"
 
 FILE *Socket(host, clientPort)

diff --git a/uid.c b/uid.c
index 25730390827514deb2af103716e7a9e9930647c2..f79c2ff00704420bf26433756ad8722bfab08474 100644 (file)
--- a/uid.c
+++ b/uid.c
@@ -7,10 +7,10 @@
 #include <config.h>
 
 #include <stdio.h>
+#include <string.h>
 
 #if defined(STDC_HEADERS)
 #include <stdlib.h>
-#include <string.h>
 #endif
 
 #if defined(HAVE_UNISTD_H)

diff --git a/xmalloc.c b/xmalloc.c
index 10b3d7e13d9bb73e7209f08eaf60b76a701861f3..a58748a437c4b81abcf76a39ffd4c57efc76336a 100644 (file)
--- a/xmalloc.c
+++ b/xmalloc.c
@@ -7,7 +7,6 @@
 #include <config.h>
 #include <stdio.h>
 #include <string.h>
-#include <sys/types.h>
 #if defined(STDC_HEADERS)
 #include  <stdlib.h>
 #endif