diff options
| author | Jens Arnold <amiconn@rockbox.org> | 2006-03-02 01:37:54 +0000 |
|---|---|---|
| committer | Jens Arnold <amiconn@rockbox.org> | 2006-03-02 01:37:54 +0000 |
| commit | b621de368b1fbfe5dd0989a9e37bf4abf9a40541 (patch) | |
| tree | 5b6ee2d0e6af5a90afebe6cbb1704533786b7d68 | |
| parent | 27f218207076081bdfef14af3fee14f73d43b92a (diff) | |
| download | rockbox-b621de368b1fbfe5dd0989a9e37bf4abf9a40541.tar.gz rockbox-b621de368b1fbfe5dd0989a9e37bf4abf9a40541.zip | |
Fixed more pointer size vs. int size problems (64 bit sims)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8882 a1c6a512-1295-4272-9138-f99709370657
| -rw-r--r-- | apps/plugins/searchengine/searchengine.c | 2 | ||||
| -rw-r--r-- | firmware/font.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/apps/plugins/searchengine/searchengine.c b/apps/plugins/searchengine/searchengine.c index b585c25f13..6c2322e950 100644 --- a/apps/plugins/searchengine/searchengine.c +++ b/apps/plugins/searchengine/searchengine.c @@ -38,7 +38,7 @@ void *my_malloc(size_t size) audio_bufferbase = audio_bufferpointer = rb->plugin_get_audio_buffer(&audio_buffer_free); audio_bufferpointer+=3; - audio_bufferpointer=(void *)(((int)audio_bufferpointer)&~3); + audio_bufferpointer=(void *)(((long)audio_bufferpointer)&~3); audio_buffer_free-=audio_bufferpointer-audio_bufferbase; } if (size + 4 > audio_buffer_free) diff --git a/firmware/font.c b/firmware/font.c index e8d5db46b9..d45c0e803f 100644 --- a/firmware/font.c +++ b/firmware/font.c @@ -172,12 +172,12 @@ struct font* font_load_in_memory(struct font* pf) if ( pf->bits_size < 0xFFDB ) { /* pad to 16-bit boundary */ - fileptr = (unsigned char *)(((int)fileptr + 1) & ~1); + fileptr = (unsigned char *)(((long)fileptr + 1) & ~1); } else { /* pad to 32-bit boundary*/ - fileptr = (unsigned char *)(((int)fileptr + 3) & ~3); + fileptr = (unsigned char *)(((long)fileptr + 3) & ~3); } if (noffset) @@ -247,13 +247,13 @@ struct font* font_load_cached(struct font* pf) { long_offset = 0; /* pad to 16-bit boundary */ - fileptr = (unsigned char *)(((int)fileptr + 1) & ~1); + fileptr = (unsigned char *)(((long)fileptr + 1) & ~1); } else { long_offset = 1; /* pad to 32-bit boundary*/ - fileptr = (unsigned char *)(((int)fileptr + 3) & ~3); + fileptr = (unsigned char *)(((long)fileptr + 3) & ~3); } if (noffset) |