(PP_MAIN, PP_UPDATE, PP_SHUTDOWN, PP_SCHED, PP_TIMESTAMP, PP_PLAYER)

(PP_ACCEPT, PP_KILLIDLE): Move from player.h to empthread.h and turn
into enumeration constants.

diff --git a/include/empthread.h b/include/empthread.h
index 916ff23f498c2cc08224a852bc2d84f49788c8db..67bd5a64ab81e3b854b4f05fce80e380f0d12645 100644 (file)
--- a/include/empthread.h
+++ b/include/empthread.h
@@ -48,6 +48,18 @@
 #ifndef _EMTHREAD_H_
 #define _EMTHREAD_H_
 
+/* thread priorities */
+enum {
+    PP_MAIN     = 7,
+    PP_UPDATE   = 6,
+    PP_SHUTDOWN         = 5,
+    PP_SCHED    = 4,
+    PP_TIMESTAMP = 2,
+    PP_PLAYER   = 3,
+    PP_ACCEPT   = 3,
+    PP_KILLIDLE         = 2
+};
+
 #ifdef EMPTH_LWP
 #include "lwp.h"
 

diff --git a/include/player.h b/include/player.h
index 75b185be69d890f79f3a0bd35d2c92e6070b1176..a8048c81a1272a0485b0646667cd35aaead75d75 100644 (file)
--- a/include/player.h
+++ b/include/player.h
@@ -91,14 +91,4 @@ enum {
     PF_UTF8 = bit(0)                   /* client wants UTF-8 */
 };
 
-/* thread priorities */
-#define PP_MAIN                7
-#define PP_UPDATE      6
-#define PP_SHUTDOWN    5
-#define PP_SCHED       4
-#define PP_TIMESTAMP    2
-#define PP_PLAYER      3
-#define PP_ACCEPT      3
-#define PP_KILLIDLE    2
-
 #endif /* _PLAYER_H_ */

diff --git a/src/lib/empthread/lwp.c b/src/lib/empthread/lwp.c
index f6746520e96e05f06c9f8def7288872febbcc0c9..5423eb2ad4f62da6fa9ac946f15cd16bb5f26de1 100644 (file)
--- a/src/lib/empthread/lwp.c
+++ b/src/lib/empthread/lwp.c
@@ -33,8 +33,7 @@
 
 #include <config.h>
 
-#include <stdio.h>
-#include "prototypes.h"
+#include <time.h>
 #include "empthread.h"
 
 /* The thread `created' by lwpInitSystem() */