From 817a048b554ed05fda836a9b55e0dc9a816334b7 Mon Sep 17 00:00:00 2001
From: "(no author)" <(no author)@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Mon, 24 Jan 2005 03:12:42 +0000
Subject: A lot of changes. login and char server compile under both TXT and
 SQL under g++. Same for the convertors (login and char). One change that I
 felt iffy about, but it worked, was the char* buf -> unsinged char* bug in
 clif.c

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@975 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
 src/common/malloc.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/common/malloc.c')

diff --git a/src/common/malloc.c b/src/common/malloc.c
index a00399a0e..089a9db18 100644
--- a/src/common/malloc.c
+++ b/src/common/malloc.c
@@ -8,7 +8,7 @@
 void* aMalloc_( size_t size, const char *file, int line, const char *func )
 {
 	void *ret;
-	
+
 //	printf("%s:%d: in func %s: malloc %d\n",file,line,func,size);
 	ret=malloc(size);
 	if(ret==NULL){
@@ -21,7 +21,7 @@ void* aMalloc_( size_t size, const char *file, int line, const char *func )
 void* aCalloc_( size_t num, size_t size, const char *file, int line, const char *func )
 {
 	void *ret;
-	
+
 //	printf("%s:%d: in func %s: calloc %d %d\n",file,line,func,num,size);
 	ret=calloc(num,size);
 	if(ret==NULL){
@@ -35,7 +35,7 @@ void* aCalloc_( size_t num, size_t size, const char *file, int line, const char
 void* aRealloc_( void *p, size_t size, const char *file, int line, const char *func )
 {
 	void *ret;
-	
+
 //	printf("%s:%d: in func %s: realloc %p %d\n",file,line,func,p,size);
 	ret=realloc(p,size);
 	if(ret==NULL){
@@ -66,7 +66,7 @@ void * _bcalloc(size_t size, size_t cnt) {
 
 char * _bstrdup(const char *chr) {
 	int len = strlen(chr);
-	char *ret = aMalloc(len + 1);
+	char *ret = (char*)aMalloc(len + 1);
 	strcpy(ret, chr);
 	return ret;
 }
-- 
cgit v1.2.3-60-g2f50