diff options
| author | ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-07-10 06:17:06 +0000 |
|---|---|---|
| committer | ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-07-10 06:17:06 +0000 |
| commit | 9ef634559f3cde232586b1dc6fd00bea3f3d8e53 (patch) | |
| tree | 541295af8a6fbfe15b09da353680be6dd4d6b3ff /src/plugins | |
| parent | 9c100697bf79604fcef8b7eedbadeed45c63b41b (diff) | |
| download | hercules-9ef634559f3cde232586b1dc6fd00bea3f3d8e53.tar.gz hercules-9ef634559f3cde232586b1dc6fd00bea3f3d8e53.tar.bz2 hercules-9ef634559f3cde232586b1dc6fd00bea3f3d8e53.tar.xz hercules-9ef634559f3cde232586b1dc6fd00bea3f3d8e53.zip | |
* Merged changes from trunk [14827:14894/trunk].
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/renewal@14895 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/console.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/console.c b/src/plugins/console.c index bf1a133ca..74c431d32 100644 --- a/src/plugins/console.c +++ b/src/plugins/console.c @@ -126,9 +126,9 @@ PLUGIN_EVENTS_TABLE = { // Imported functions -typedef int (*TimerFunc)(int tid, unsigned int tick, int id, intptr data); +typedef int (*TimerFunc)(int tid, unsigned int tick, int id, intptr_t data); int (*add_timer_func_list)(TimerFunc func, char* name); -int (*add_timer_interval)(unsigned int tick, TimerFunc func, int id, intptr data, int interval); +int (*add_timer_interval)(unsigned int tick, TimerFunc func, int id, intptr_t data, int interval); int (*delete_timer)(int tid, TimerFunc func); unsigned int (*gettick)(void); int (*parse_console)(const char* buf); @@ -423,7 +423,7 @@ WORKER_FUNC_END(getinput) /// Timer function that checks if there's assynchronous input data and feeds parse_console() /// The input reads one line at a time and line terminators are removed. -int console_getinputtimer(int tid, unsigned int tick, int id, intptr data) +int console_getinputtimer(int tid, unsigned int tick, int id, intptr_t data) { char* cmd; size_t len; |