From b9578c1d8ce54b48363e297b1c56cdea0ed72821 Mon Sep 17 00:00:00 2001 From: Haru Date: Sun, 13 Mar 2016 15:48:14 +0100 Subject: Removed unnecessary typedefs from thread and spinlock - SPIN_LOCK -> struct spin_lock - rAthread -> struct thread_handle - rAthreadProc -> threadFunc - RATHREAD_PRIO -> enum thread_priority - RAT_PRIO_LOW -> THREADPRIO_LOW - RAT_PRIO_NORMAL -> THREADPRIO_NORMAL - RAT_PRIO_HIGH -> THREADPRIO_HIGH - RA_THREADS_MAX -> THREADS_MAX Signed-off-by: Haru fixupthread --- src/common/console.h | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'src/common/console.h') diff --git a/src/common/console.h b/src/common/console.h index f97e36456..dd3a9cf2e 100644 --- a/src/common/console.h +++ b/src/common/console.h @@ -23,12 +23,13 @@ #include "common/hercules.h" #include "common/db.h" #include "common/spinlock.h" -#include "common/thread.h" /* Forward Declarations */ struct Sql; // common/sql.h -struct mutex_data; struct cond_data; +struct mutex_data; +struct spin_lock; +struct thread_handle; /** * Queue Max @@ -72,11 +73,11 @@ struct CParseEntry { struct console_input_interface { #ifdef CONSOLE_INPUT /* vars */ - SPIN_LOCK ptlock;/* parse thread lock */ - rAthread *pthread;/* parse thread */ - volatile int32 ptstate;/* parse thread state */ - struct mutex_data *ptmutex; ///< parse thread mutex. - struct cond_data *ptcond; ///< parse thread conditional variable. + struct spin_lock *ptlock; ///< parse thread lock. + struct thread_handle *pthread; ///< parse thread. + volatile int32 ptstate; ///< parse thread state. + struct mutex_data *ptmutex; ///< parse thread mutex. + struct cond_data *ptcond; ///< parse thread conditional variable. /* */ VECTOR_DECL(struct CParseEntry *) command_list; VECTOR_DECL(struct CParseEntry *) commands; -- cgit v1.2.3-60-g2f50