From 09c4e2b26b2a7f1a06202b300f0dc1ce1fe04abf Mon Sep 17 00:00:00 2001 From: ultramage Date: Thu, 30 Jun 2011 09:14:21 +0000 Subject: Replaced custom type 'intptr' with standard 'intptr_t'. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14873 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/map.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/map/map.c') diff --git a/src/map/map.c b/src/map/map.c index 8209c1033..0c60e94aa 100644 --- a/src/map/map.c +++ b/src/map/map.c @@ -240,7 +240,7 @@ int map_freeblock_unlock (void) // この関数は、do_timer() のトップレベルから呼ばれるので、 // block_free_lock を直接いじっても支障無いはず。 -int map_freeblock_timer(int tid, unsigned int tick, int id, intptr data) +int map_freeblock_timer(int tid, unsigned int tick, int id, intptr_t data) { if (block_free_lock > 0) { ShowError("map_freeblock_timer: block_free_lock(%d) is invalid.\n", block_free_lock); @@ -1217,7 +1217,7 @@ int map_get_new_object_id(void) * 後者は、map_clearflooritem(id)へ * map.h?で#defineしてある *------------------------------------------*/ -int map_clearflooritem_timer(int tid, unsigned int tick, int id, intptr data) +int map_clearflooritem_timer(int tid, unsigned int tick, int id, intptr_t data) { struct flooritem_data* fitem = (struct flooritem_data*)idb_get(id_db, id); if( fitem==NULL || fitem->bl.type!=BL_ITEM || (!data && fitem->cleartimer != tid) ) @@ -2146,7 +2146,7 @@ int map_removemobs_sub(struct block_list *bl, va_list ap) return 1; } -int map_removemobs_timer(int tid, unsigned int tick, int id, intptr data) +int map_removemobs_timer(int tid, unsigned int tick, int id, intptr_t data) { int count; const int m = id; -- cgit v1.2.3-60-g2f50