From 3b90d0cb8123c900ca5b878281d8c5ed2cf611ff Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Wed, 28 Dec 2005 21:21:15 +0000 Subject: [PATCH] (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. --- include/empthread.h | 12 ++++++++++++ include/player.h | 10 ---------- src/lib/empthread/lwp.c | 3 +-- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/include/empthread.h b/include/empthread.h index 916ff23f..67bd5a64 100644 --- 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 75b185be..a8048c81 100644 --- 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 f6746520..5423eb2a 100644 --- a/src/lib/empthread/lwp.c +++ b/src/lib/empthread/lwp.c @@ -33,8 +33,7 @@ #include -#include -#include "prototypes.h" +#include #include "empthread.h" /* The thread `created' by lwpInitSystem() */