diff options
| author | panikon <panikon@zoho.com> | 2014-05-10 06:08:56 -0300 |
|---|---|---|
| committer | panikon <panikon@zoho.com> | 2014-05-10 06:08:56 -0300 |
| commit | 94657284973f4037596bae468ebfbee5c217e02b (patch) | |
| tree | c99c1e3a39ad41183f2d70eb093df54ca60ad0fb /src/common/console.h | |
| parent | a1eba2e076401ddbc34e5a65e15bb0f418591b1a (diff) | |
| download | hercules-94657284973f4037596bae468ebfbee5c217e02b.tar.gz hercules-94657284973f4037596bae468ebfbee5c217e02b.tar.bz2 hercules-94657284973f4037596bae468ebfbee5c217e02b.tar.xz hercules-94657284973f4037596bae468ebfbee5c217e02b.zip | |
Revert "Fixed order of includes in all source files"
This reverts commit b6b3f58795288701d0e162d43fa6f0a47af913b3.
Fixes issue 8184
http://hercules.ws/board/tracker/issue-8184-cart-related/
Diffstat (limited to 'src/common/console.h')
| -rw-r--r-- | src/common/console.h | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/src/common/console.h b/src/common/console.h index d2c58f978..3d19ddc9d 100644 --- a/src/common/console.h +++ b/src/common/console.h @@ -4,13 +4,11 @@ #ifndef _COMMON_CONSOLE_H_ #define _COMMON_CONSOLE_H_ -#include "../config/core.h" // MAX_CONSOLE_INPUT - -#include "../common/cbasetypes.h" +#include "../common/thread.h" #include "../common/mutex.h" #include "../common/spinlock.h" #include "../common/sql.h" -#include "../common/thread.h" +#include "../config/core.h" /** * Queue Max @@ -49,8 +47,11 @@ struct { unsigned short count; } cinput; +struct console_interface { + void (*init) (void); + void (*final) (void); + void (*display_title) (void); #ifdef CONSOLE_INPUT -struct console_input_interface { /* vars */ SPIN_LOCK ptlock;/* parse thread lock */ rAthread pthread;/* parse thread */ @@ -76,17 +77,7 @@ struct console_input_interface { void (*parse_list_subs) (struct CParseEntry *cmd, unsigned char depth); void (*addCommand) (char *name, CParseFunc func); void (*setSQL) (Sql *SQL_handle); -}; -#else -struct console_input_interface; #endif - -struct console_interface { - void (*init) (void); - void (*final) (void); - void (*display_title) (void); - - struct console_input_interface *input; }; struct console_interface *console; |