diff options
| author | shennetsind <ind@henn.et> | 2013-03-17 18:44:17 -0300 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2013-03-17 18:44:17 -0300 |
| commit | 81809c70483a1046f64d25ef4ad88c850ff6a0a2 (patch) | |
| tree | 262b6c18e5b472110cd76ead613df1c24ab5a625 /src/common | |
| parent | abe2a6291750f79355cc07d5af37c8f97aa430b3 (diff) | |
| download | hercules-81809c70483a1046f64d25ef4ad88c850ff6a0a2.tar.gz hercules-81809c70483a1046f64d25ef4ad88c850ff6a0a2.tar.bz2 hercules-81809c70483a1046f64d25ef4ad88c850ff6a0a2.tar.xz hercules-81809c70483a1046f64d25ef4ad88c850ff6a0a2.zip | |
Fixed mysterious msvc LNK2005 error.
Also fixed title being displayed twice.
Signed-off-by: shennetsind <ind@henn.et>
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/console.c | 7 | ||||
| -rw-r--r-- | src/common/console.h | 3 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/common/console.c b/src/common/console.c index ee4570b2a..08ab6bcd4 100644 --- a/src/common/console.c +++ b/src/common/console.c @@ -3,9 +3,9 @@ // Portions Copyright (c) Athena Dev Teams #include "../common/showmsg.h" -#include "../common/console.h" +#include "../common/core.h" #include "../config/core.h" -#include "core.h" +#include "console.h" #ifndef MINICORE #include "../common/atomic.h" @@ -30,6 +30,8 @@ #endif #endif +struct console_interface console_s; + /*====================================== * CORE : Display title *--------------------------------------*/ @@ -160,7 +162,6 @@ void console_parse_init(void) { #endif /* CONSOLE_INPUT */ void console_init (void) { - console->display_title(); #ifdef CONSOLE_INPUT console->parse_init(); #endif diff --git a/src/common/console.h b/src/common/console.h index d0b9e8bb1..7f1490084 100644 --- a/src/common/console.h +++ b/src/common/console.h @@ -4,7 +4,6 @@ #ifndef _CONSOLE_H_ #define _CONSOLE_H_ -#include "../common/atomic.h" #include "../common/thread.h" #include "../common/mutex.h" #include "../common/spinlock.h" @@ -39,7 +38,7 @@ struct console_interface { void (*parse) (char* line); int (*key_pressed) (void); #endif -} console_s; +}; struct console_interface *console; |