From c1a8f6f0ac98a694e670bae4c8f74db126e0e8e8 Mon Sep 17 00:00:00 2001 From: amber Date: Tue, 29 Mar 2005 06:18:21 +0000 Subject: 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 --- src/common/malloc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/common/malloc.h') diff --git a/src/common/malloc.h b/src/common/malloc.h index c59c08a4e..1bc0eb292 100644 --- a/src/common/malloc.h +++ b/src/common/malloc.h @@ -63,7 +63,7 @@ void* aCalloc_( size_t num, size_t size, const char *file, int line, const char *func ); void* aRealloc_( void *p, size_t size, const char *file, int line, const char *func ); void aFree_( void *p, const char *file, int line, const char *func ); - void* aStrdup_( const void *p, const char *file, int line, const char *func ); + char* aStrdup_( const void *p, const char *file, int line, const char *func ); # define aMalloc(n) aMalloc_(n,ALC_MARK) # define aMallocA(n) aMalloc_(n,ALC_MARK) -- cgit v1.2.3-70-g09d2