From 49e9510c432987393d10ec1b8b1c2d416c9feb42 Mon Sep 17 00:00:00 2001
From: ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Wed, 26 Mar 2008 10:37:45 +0000
Subject: Adjusted eAthena code to compile cleanly in C++ mode.

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12436 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
 src/map/mercenary.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/map/mercenary.c')

diff --git a/src/map/mercenary.c b/src/map/mercenary.c
index 039a7f446..66658a1d9 100644
--- a/src/map/mercenary.c
+++ b/src/map/mercenary.c
@@ -606,7 +606,7 @@ int merc_hom_alloc(struct map_session_data *sd, struct s_homunculus *hom)
 		intif_homunculus_requestdelete(hom->hom_id);
 		return 1;
 	}
-	sd->hd = hd = aCalloc(1,sizeof(struct homun_data));
+	sd->hd = hd = (struct homun_data*)aCalloc(1,sizeof(struct homun_data));
 	hd->bl.type = BL_HOM;
 	hd->bl.id = npc_get_new_npc_id();
 
-- 
cgit v1.2.3-60-g2f50