summaryrefslogtreecommitdiff
path: root/src/map/map.c
diff options
context:
space:
mode:
authoramber <amber@54d463be-8e91-2dee-dedb-b68131a5f0ec>2005-03-29 06:18:21 +0000
committeramber <amber@54d463be-8e91-2dee-dedb-b68131a5f0ec>2005-03-29 06:18:21 +0000
commitc1a8f6f0ac98a694e670bae4c8f74db126e0e8e8 (patch)
tree57a37cf82ced0b0b998b99e5dfdc27d62932420a /src/map/map.c
parent7bfe35400c79bf97a5b0bed9f170912c37cf9452 (diff)
downloadhercules-c1a8f6f0ac98a694e670bae4c8f74db126e0e8e8.tar.gz
hercules-c1a8f6f0ac98a694e670bae4c8f74db126e0e8e8.tar.bz2
hercules-c1a8f6f0ac98a694e670bae4c8f74db126e0e8e8.tar.xz
hercules-c1a8f6f0ac98a694e670bae4c8f74db126e0e8e8.zip
Fixe compile time problems with our mixed C++/C conformance
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@1328 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/map.c')
-rw-r--r--src/map/map.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/map/map.c b/src/map/map.c
index db2831cf5..19edfd08b 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -2012,7 +2012,7 @@ int map_eraseipport(char *name,unsigned long ip,int port)
struct map_data_other_server *mdos;
// unsigned char *p=(unsigned char *)&ip;
- md=strdb_search(map_db,name);
+ md=(struct map_data *) strdb_search(map_db,name);
if(md){
if(md->gat) // local -> check data
return 0;
@@ -3119,13 +3119,13 @@ int id_db_final(void *k,void *d,va_list ap) { return 0; }
int map_db_final(void *k,void *d,va_list ap) { return 0; }
int nick_db_final(void *k,void *d,va_list ap)
{
- char *p = d;
+ char *p = (char *) d;
if (p) aFree(p);
return 0;
}
int charid_db_final(void *k,void *d,va_list ap)
{
- struct charid2nick *p = d;
+ struct charid2nick *p = (struct charid2nick *) d;
if (p) aFree(p);
return 0;
}