Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed bugreport:6621 get rid of some warnings that probably caused the map-server to crash on x64 systems.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16747 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
greenboxal2 2012-09-05 11:17:26 +00:00
parent 31d2fe26b3
commit 3a5e9a8bbc
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/common/ers.c
View File

@ -51,7 +51,6 @@
#define ERS_ROOT_SIZE 256 #define ERS_ROOT_SIZE 256
#define ERS_BLOCK_ENTRIES 4096 #define ERS_BLOCK_ENTRIES 4096
typedef struct ers_instance_t;
struct ers_list struct ers_list
{ {
struct ers_list *Next; struct ers_list *Next;
@ -169,7 +168,7 @@ static void *ers_obj_alloc_entry(ERS self)
if (instance->Cache->ReuseList != NULL) if (instance->Cache->ReuseList != NULL)
{ {
ret = (void *)((unsigned int)instance->Cache->ReuseList + sizeof(struct ers_list)); ret = (void *)((unsigned char *)instance->Cache->ReuseList + sizeof(struct ers_list));
instance->Cache->ReuseList = instance->Cache->ReuseList->Next; instance->Cache->ReuseList = instance->Cache->ReuseList->Next;
} }
else if (instance->Cache->Free > 0) else if (instance->Cache->Free > 0)
@ -200,7 +199,7 @@ static void *ers_obj_alloc_entry(ERS self)
static void ers_obj_free_entry(ERS self, void *entry) static void ers_obj_free_entry(ERS self, void *entry)
{ {
ers_instance_t *instance = (ers_instance_t *)self; ers_instance_t *instance = (ers_instance_t *)self;
struct ers_list *reuse = (struct ers_list *)((unsigned int)entry - sizeof(struct ers_list)); struct ers_list *reuse = (struct ers_list *)((unsigned char *)entry - sizeof(struct ers_list));
if (instance == NULL) if (instance == NULL)
{ {