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.

diff --git a/include/empio.h b/include/empio.h
index 5d0af8232a94f872112a3756e4549d340cbc7d0f..56f634513cd541f47d8906c2d436bac2d9008305 100644 (file)
--- a/include/empio.h
+++ b/include/empio.h
@@ -34,8 +34,6 @@
 #ifndef _EMPIO_H_
 #define _EMPIO_H_
 
 #ifndef _EMPIO_H_
 #define _EMPIO_H_
 

-#include <time.h>              /* struct timeval */
-

 #define        IO_READ         0x1
 #define IO_WRITE       0x2
 #define IO_NEWSOCK     0x4
 #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 000a29ac1a33f427f576fd057a3aee492f338eef..4e7f992970c7c9fb338e20cf8a2ffe7e71999d9e 100644 (file)
--- a/src/lib/commands/info.c
+++ b/src/lib/commands/info.c
@@ -36,17 +36,18 @@
 
 #include <config.h>
 
 
 #include <config.h>
 

-#include "misc.h"
-#include "player.h"

 #include <errno.h>
 #include <string.h>
 #include <stdio.h>
 #include <sys/stat.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
 #if !defined(_WIN32)
 #include <dirent.h>
 #else
 #include <windows.h>
 #endif

+#include "misc.h"
+#include "player.h"

 #include "commands.h"
 #include "optlist.h"
 
 #include "commands.h"
 #include "optlist.h"
 

diff --git a/src/lib/commands/mobu.c b/src/lib/commands/mobu.c
index e5f807fbec02d5c45a4d4b75115aeede967beb82..b1ff3736ee3787af8384338383322a41075c3237 100644 (file)
--- a/src/lib/commands/mobu.c
+++ b/src/lib/commands/mobu.c
@@ -33,6 +33,8 @@
 
 #include <config.h>
 
 
 #include <config.h>
 

+#include <stdio.h>
+#include <time.h>

 #include "misc.h"
 #include "player.h"
 #include "nsc.h"
 #include "misc.h"
 #include "player.h"
 #include "nsc.h"


@@ -42,8 +44,6 @@
 #include "server.h"
 #include "prototypes.h"
 
 #include "server.h"
 #include "prototypes.h"
 

-#include <stdio.h>
-

 int
 mobupdate(void)
 {
 int
 mobupdate(void)
 {

diff --git a/src/lib/commands/turn.c b/src/lib/commands/turn.c
index c2841047702d4e2668d16eb37bf60174bd5ae66e..e48738719b8a6a7a333ad05cf61ac4f02de6939f 100644 (file)
--- a/src/lib/commands/turn.c
+++ b/src/lib/commands/turn.c
@@ -33,15 +33,15 @@
 
 #include <config.h>
 
 
 #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 "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.
  */
 /*
  * 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 a83f8b18592e07557bbf17c69075ebcbdddb44f5..758304c53e1fa57522e67b8db99ffb95b0e91a28 100644 (file)
--- a/src/lib/commands/upda.c
+++ b/src/lib/commands/upda.c
@@ -35,6 +35,7 @@
 
 #include <stdio.h>
 #include <sys/types.h>
 
 #include <stdio.h>
 #include <sys/types.h>

+#include <time.h>

 #include "misc.h"
 #include "player.h"
 #include "commands.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 78611671b5788ba056fdefe4602d7e1d670efb12..f78c77535749061023b5f69d30d686e564377fc2 100644 (file)
--- a/src/lib/update/anno.c
+++ b/src/lib/update/anno.c
@@ -37,10 +37,10 @@
 
 #include "misc.h"
 #include "tel.h"
 
 #include "misc.h"
 #include "tel.h"

-#include <stdio.h>

 #include <fcntl.h>
 #include <fcntl.h>

+#include <stdio.h>
+#include <time.h>

 #if !defined(_WIN32)
 #if !defined(_WIN32)

-#include <sys/file.h>

 #include <unistd.h>
 #endif
 #include "update.h"
 #include <unistd.h>
 #endif
 #include "update.h"

diff --git a/src/server/idle.c b/src/server/idle.c
index d2211201caf07edbb38d9d5a3d2e073c911eec19..19609056a0c390602ba32c25aeb5be2e0111d313 100644 (file)
--- a/src/server/idle.c
+++ b/src/server/idle.c
@@ -33,6 +33,7 @@
 
 #include <config.h>
 
 
 #include <config.h>
 

+#include <time.h>

 #include "misc.h"
 #include "player.h"
 #include "empio.h"
 #include "misc.h"
 #include "player.h"
 #include "empio.h"

diff --git a/src/server/timestamp.c b/src/server/timestamp.c
index 51f0c2a9127de3effcabf4fb95e9844527a597bd..224d3760def4648bcd4c87a1ecf3b03004435376 100644 (file)
--- a/src/server/timestamp.c
+++ b/src/server/timestamp.c
@@ -34,10 +34,11 @@
 
 #include <config.h>
 
 
 #include <config.h>
 

+#include <stdio.h>
+#include <time.h>

 #include "misc.h"
 #include "player.h"
 #include "empthread.h"
 #include "misc.h"
 #include "player.h"
 #include "empthread.h"

-#include <stdio.h>

 #include "prototypes.h"
 #include "optlist.h"
 #include "server.h"
 #include "prototypes.h"
 #include "optlist.h"
 #include "server.h"

diff --git a/src/server/update.c b/src/server/update.c
index 3a8f60ce3d758d62fd17f302f3fa4b0b2e3926a8..283abd9dd79c2b6b765164efbf2e952876ecc8ff 100644 (file)
--- a/src/server/update.c
+++ b/src/server/update.c
@@ -39,6 +39,7 @@
 #ifndef _WIN32
 #include <sys/wait.h>
 #endif
 #ifndef _WIN32
 #include <sys/wait.h>
 #endif

+#include <time.h>

 #include "misc.h"
 #include "player.h"
 #include "empthread.h"
 #include "misc.h"
 #include "player.h"
 #include "empthread.h"