Commit 436224b0 authored by Erik Faye-Lund's avatar Erik Faye-Lund
Browse files

more 64bit fixes

git-svn-id: https://pimpmobile.svn.sourceforge.net/svnroot/pimpmobile/trunk@365 3d5ecaf0-f903-0410-b953-c2c1a4d75763
parent 7ae0e264
......@@ -151,6 +151,7 @@ void serialize_string(struct serializer *s, const char *str, const size_t len)
void serialize_pointer(struct serializer *s, void *ptr)
{
int iptr;
ASSERT(NULL != s);
TRACE();
......@@ -160,7 +161,9 @@ void serialize_pointer(struct serializer *s, void *ptr)
/* printf("dumping ptr: %p\n", ptr); */
if (NULL != ptr) pointer_map.insert(std::make_pair(ptr, s->pos));
serialize_word(s, (unsigned int)ptr);
iptr = ptr & ((1ULL<<32) - 1);
ASSERT(ptr == iptr);
serialize_word(s, iptr);
}
void serializer_set_pointer(struct serializer *s, void *ptr, int pos)
......
......@@ -41,7 +41,7 @@ int pimp_sample_bank_insert_sample_data(pimp_sample_bank *sample_bank, void *dat
/* copy data */
{
void *dst = (void*)((int)sample_bank->data + pos);
void *dst = (void*)((u8*)sample_bank->data + pos);
memcpy(dst, data, len);
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment