summaryrefslogtreecommitdiff
path: root/src/map/mercenary.c
diff options
context:
space:
mode:
authorultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-06-30 09:14:21 +0000
committerultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-06-30 09:14:21 +0000
commit09c4e2b26b2a7f1a06202b300f0dc1ce1fe04abf (patch)
tree9971dee8e7148436dcb49af51bb820d764f10c21 /src/map/mercenary.c
parentdd73c6ea546a8828653cdce38a52f575cbdd3b96 (diff)
downloadhercules-09c4e2b26b2a7f1a06202b300f0dc1ce1fe04abf.tar.gz
hercules-09c4e2b26b2a7f1a06202b300f0dc1ce1fe04abf.tar.bz2
hercules-09c4e2b26b2a7f1a06202b300f0dc1ce1fe04abf.tar.xz
hercules-09c4e2b26b2a7f1a06202b300f0dc1ce1fe04abf.zip
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
Diffstat (limited to 'src/map/mercenary.c')
-rw-r--r--src/map/mercenary.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/map/mercenary.c b/src/map/mercenary.c
index 8300628d5..f6fa6bdaa 100644
--- a/src/map/mercenary.c
+++ b/src/map/mercenary.c
@@ -215,7 +215,7 @@ int mercenary_save(struct mercenary_data *md)
return 1;
}
-static int merc_contract_end(int tid, unsigned int tick, int id, intptr data)
+static int merc_contract_end(int tid, unsigned int tick, int id, intptr_t data)
{
struct map_session_data *sd;
struct mercenary_data *md;