diff options
| author | shennetsind <ind@henn.et> | 2013-10-30 18:38:14 -0200 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2013-10-30 18:38:14 -0200 |
| commit | 7fefefdde386f13f8fefa8db3ffe9ed140c8aa10 (patch) | |
| tree | 715f3b80d75cab3a9c2a3abd04ae4461165e8854 /src/common/console.c | |
| parent | a2405882a4123d6a11d24e895b40148dc7cb455e (diff) | |
| parent | bd04c6c566902d03d633b4dfee5335361155a79e (diff) | |
| download | hercules-7fefefdde386f13f8fefa8db3ffe9ed140c8aa10.tar.gz hercules-7fefefdde386f13f8fefa8db3ffe9ed140c8aa10.tar.bz2 hercules-7fefefdde386f13f8fefa8db3ffe9ed140c8aa10.tar.xz hercules-7fefefdde386f13f8fefa8db3ffe9ed140c8aa10.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src/common/console.c')
| -rw-r--r-- | src/common/console.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/common/console.c b/src/common/console.c index b25de84b3..cb8ed5917 100644 --- a/src/common/console.c +++ b/src/common/console.c @@ -344,7 +344,7 @@ void *cThread_main(void *x) { return NULL; } -int console_parse_timer(int tid, unsigned int tick, int id, intptr_t data) { +int console_parse_timer(int tid, int64 tick, int id, intptr_t data) { int i; EnterSpinLock(&console->ptlock); for(i = 0; i < cinput.count; i++) { |