From 0d267e0b24dc710fb13b24cd3b340c6794c99f75 Mon Sep 17 00:00:00 2001
From: Markus Armbruster <armbru@pond.sub.org>
Date: Wed, 28 Dec 2005 21:25:39 +0000
Subject: [PATCH] There's no reason to include <time.h> in empio.h, except it's
 missing in a couple of other files.  Include it where it's needed.

---
 include/empio.h         | 2 --
 src/lib/commands/info.c | 5 +++--
 src/lib/commands/mobu.c | 4 ++--
 src/lib/commands/turn.c | 6 +++---
 src/lib/commands/upda.c | 1 +
 src/lib/update/anno.c   | 4 ++--
 src/server/idle.c       | 1 +
 src/server/timestamp.c  | 3 ++-
 src/server/update.c     | 1 +
 9 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/include/empio.h b/include/empio.h
index 5d0af823..56f63451 100644
--- a/include/empio.h
+++ b/include/empio.h
@@ -34,8 +34,6 @@
 #ifndef _EMPIO_H_
 #define _EMPIO_H_
 
-#include <time.h>		/* struct timeval */
-
 #define	IO_READ		0x1
 #define IO_WRITE	0x2
 #define IO_NEWSOCK	0x4
diff --git a/src/lib/commands/info.c b/src/lib/commands/info.c
index 000a29ac..4e7f9929 100644
--- a/src/lib/commands/info.c
+++ b/src/lib/commands/info.c
@@ -36,17 +36,18 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
 #include <errno.h>
 #include <string.h>
 #include <stdio.h>
 #include <sys/stat.h>
+#include <time.h>
 #if !defined(_WIN32)
 #include <dirent.h>
 #else
 #include <windows.h>
 #endif
+#include "misc.h"
+#include "player.h"
 #include "commands.h"
 #include "optlist.h"
 
diff --git a/src/lib/commands/mobu.c b/src/lib/commands/mobu.c
index e5f807fb..b1ff3736 100644
--- a/src/lib/commands/mobu.c
+++ b/src/lib/commands/mobu.c
@@ -33,6 +33,8 @@
 
 #include <config.h>
 
+#include <stdio.h>
+#include <time.h>
 #include "misc.h"
 #include "player.h"
 #include "nsc.h"
@@ -42,8 +44,6 @@
 #include "server.h"
 #include "prototypes.h"
 
-#include <stdio.h>
-
 int
 mobupdate(void)
 {
diff --git a/src/lib/commands/turn.c b/src/lib/commands/turn.c
index c2841047..e4873871 100644
--- a/src/lib/commands/turn.c
+++ b/src/lib/commands/turn.c
@@ -33,15 +33,15 @@
 
 #include <config.h>
 
+#include <errno.h>
+#include <fcntl.h>
+#include <time.h>
 #include "misc.h"
 #include "player.h"
 #include "tel.h"
 #include "commands.h"
 #include "optlist.h"
 
-#include <errno.h>
-#include <fcntl.h>
-
 /*
  * Enable / disable logins and set the message of the day.
  */
diff --git a/src/lib/commands/upda.c b/src/lib/commands/upda.c
index a83f8b18..758304c5 100644
--- a/src/lib/commands/upda.c
+++ b/src/lib/commands/upda.c
@@ -35,6 +35,7 @@
 
 #include <stdio.h>
 #include <sys/types.h>
+#include <time.h>
 #include "misc.h"
 #include "player.h"
 #include "commands.h"
diff --git a/src/lib/update/anno.c b/src/lib/update/anno.c
index 78611671..f78c7753 100644
--- a/src/lib/update/anno.c
+++ b/src/lib/update/anno.c
@@ -37,10 +37,10 @@
 
 #include "misc.h"
 #include "tel.h"
-#include <stdio.h>
 #include <fcntl.h>
+#include <stdio.h>
+#include <time.h>
 #if !defined(_WIN32)
-#include <sys/file.h>
 #include <unistd.h>
 #endif
 #include "update.h"
diff --git a/src/server/idle.c b/src/server/idle.c
index d2211201..19609056 100644
--- a/src/server/idle.c
+++ b/src/server/idle.c
@@ -33,6 +33,7 @@
 
 #include <config.h>
 
+#include <time.h>
 #include "misc.h"
 #include "player.h"
 #include "empio.h"
diff --git a/src/server/timestamp.c b/src/server/timestamp.c
index 51f0c2a9..224d3760 100644
--- a/src/server/timestamp.c
+++ b/src/server/timestamp.c
@@ -34,10 +34,11 @@
 
 #include <config.h>
 
+#include <stdio.h>
+#include <time.h>
 #include "misc.h"
 #include "player.h"
 #include "empthread.h"
-#include <stdio.h>
 #include "prototypes.h"
 #include "optlist.h"
 #include "server.h"
diff --git a/src/server/update.c b/src/server/update.c
index 3a8f60ce..283abd9d 100644
--- a/src/server/update.c
+++ b/src/server/update.c
@@ -39,6 +39,7 @@
 #ifndef _WIN32
 #include <sys/wait.h>
 #endif
+#include <time.h>
 #include "misc.h"
 #include "player.h"
 #include "empthread.h"