devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Fixed more pointer size vs. int size problems (64 bit sims)

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8882 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jens Arnold 2006-03-02 01:37:54 +00:00
parent 27f2182070
commit b621de368b
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
apps/plugins/searchengine/searchengine.c
View file

@ -38,7 +38,7 @@ void *my_malloc(size_t size)
audio_bufferbase = audio_bufferpointer audio_bufferbase = audio_bufferpointer
= rb->plugin_get_audio_buffer(&audio_buffer_free); = rb->plugin_get_audio_buffer(&audio_buffer_free);
audio_bufferpointer+=3; audio_bufferpointer+=3;
audio_bufferpointer=(void *)(((int)audio_bufferpointer)&~3); audio_bufferpointer=(void *)(((long)audio_bufferpointer)&~3);
audio_buffer_free-=audio_bufferpointer-audio_bufferbase; audio_buffer_free-=audio_bufferpointer-audio_bufferbase;
} }
if (size + 4 > audio_buffer_free) if (size + 4 > audio_buffer_free)

8
firmware/font.c
View file

@ -172,12 +172,12 @@ struct font* font_load_in_memory(struct font* pf)
if ( pf->bits_size < 0xFFDB ) if ( pf->bits_size < 0xFFDB )
{ {
/* pad to 16-bit boundary */ /* pad to 16-bit boundary */
fileptr = (unsigned char *)(((int)fileptr + 1) & ~1); fileptr = (unsigned char *)(((long)fileptr + 1) & ~1);
} }
else else
{ {
/* pad to 32-bit boundary*/ /* pad to 32-bit boundary*/
fileptr = (unsigned char *)(((int)fileptr + 3) & ~3); fileptr = (unsigned char *)(((long)fileptr + 3) & ~3);
} }
if (noffset) if (noffset)
@ -247,13 +247,13 @@ struct font* font_load_cached(struct font* pf)
{ {
long_offset = 0; long_offset = 0;
/* pad to 16-bit boundary */ /* pad to 16-bit boundary */
fileptr = (unsigned char *)(((int)fileptr + 1) & ~1); fileptr = (unsigned char *)(((long)fileptr + 1) & ~1);
} }
else else
{ {
long_offset = 1; long_offset = 1;
/* pad to 32-bit boundary*/ /* pad to 32-bit boundary*/
fileptr = (unsigned char *)(((int)fileptr + 3) & ~3); fileptr = (unsigned char *)(((long)fileptr + 3) & ~3);
} }
if (noffset) if (noffset)