diff options
Diffstat (limited to 'lib')
-rw-r--r-- | lib/rbcodec/codecs/liba52/bitstream.c | 2 | ||||
-rw-r--r-- | lib/rbcodec/codecs/libtremor/codebook.c | 6 | ||||
-rw-r--r-- | lib/rbcodec/metadata/id3tags.c | 6 | ||||
-rw-r--r-- | lib/tlsf/src/tlsf.c | 7 |
4 files changed, 11 insertions, 10 deletions
diff --git a/lib/rbcodec/codecs/liba52/bitstream.c b/lib/rbcodec/codecs/liba52/bitstream.c index 155368f1ed..69dd1dc5b7 100644 --- a/lib/rbcodec/codecs/liba52/bitstream.c +++ b/lib/rbcodec/codecs/liba52/bitstream.c | |||
@@ -35,7 +35,7 @@ void a52_bitstream_set_ptr (a52_state_t * state, uint8_t * buf) | |||
35 | { | 35 | { |
36 | int align; | 36 | int align; |
37 | 37 | ||
38 | align = (long)buf & 3; | 38 | align = (intptr_t)buf & 3; |
39 | state->buffer_start = (uint32_t *) (buf - align); | 39 | state->buffer_start = (uint32_t *) (buf - align); |
40 | state->bits_left = 0; | 40 | state->bits_left = 0; |
41 | state->current_word = 0; | 41 | state->current_word = 0; |
diff --git a/lib/rbcodec/codecs/libtremor/codebook.c b/lib/rbcodec/codecs/libtremor/codebook.c index 7087f0a323..f3ac5a2b7e 100644 --- a/lib/rbcodec/codecs/libtremor/codebook.c +++ b/lib/rbcodec/codecs/libtremor/codebook.c | |||
@@ -293,7 +293,7 @@ static long decode_packed_block(codebook *book, oggpack_buffer *b, | |||
293 | if(b->endbyte < b->storage - 8) { | 293 | if(b->endbyte < b->storage - 8) { |
294 | ogg_uint32_t *ptr; | 294 | ogg_uint32_t *ptr; |
295 | unsigned long bit, bitend; | 295 | unsigned long bit, bitend; |
296 | unsigned long adr; | 296 | intptr_t adr; |
297 | ogg_uint32_t cache = 0; | 297 | ogg_uint32_t cache = 0; |
298 | int cachesize = 0; | 298 | int cachesize = 0; |
299 | const unsigned int cachemask = (1<<book->dec_firsttablen)-1; | 299 | const unsigned int cachemask = (1<<book->dec_firsttablen)-1; |
@@ -303,7 +303,7 @@ static long decode_packed_block(codebook *book, oggpack_buffer *b, | |||
303 | const ogg_uint32_t *book_codelist = book->codelist; | 303 | const ogg_uint32_t *book_codelist = book->codelist; |
304 | const char *book_dec_codelengths = book->dec_codelengths; | 304 | const char *book_dec_codelengths = book->dec_codelengths; |
305 | 305 | ||
306 | adr = (unsigned long)b->ptr; | 306 | adr = (intptr_t)b->ptr; |
307 | bit = (adr&3)*8+b->endbit; | 307 | bit = (adr&3)*8+b->endbit; |
308 | ptr = (ogg_uint32_t*)(adr&~3); | 308 | ptr = (ogg_uint32_t*)(adr&~3); |
309 | bitend = ((adr&3)+(b->storage-b->endbyte))*8; | 309 | bitend = ((adr&3)+(b->storage-b->endbyte))*8; |
@@ -334,7 +334,7 @@ static long decode_packed_block(codebook *book, oggpack_buffer *b, | |||
334 | cache >>= l; | 334 | cache >>= l; |
335 | } | 335 | } |
336 | 336 | ||
337 | adr=(unsigned long)b->ptr; | 337 | adr=(intptr_t)b->ptr; |
338 | bit-=(adr&3)*8+cachesize; | 338 | bit-=(adr&3)*8+cachesize; |
339 | b->endbyte+=bit/8; | 339 | b->endbyte+=bit/8; |
340 | b->ptr+=bit/8; | 340 | b->ptr+=bit/8; |
diff --git a/lib/rbcodec/metadata/id3tags.c b/lib/rbcodec/metadata/id3tags.c index 3492197c40..cda8ce3b7a 100644 --- a/lib/rbcodec/metadata/id3tags.c +++ b/lib/rbcodec/metadata/id3tags.c | |||
@@ -191,7 +191,7 @@ static int unsynchronize(char* tag, int len, bool *ff_found) | |||
191 | wp++; | 191 | wp++; |
192 | } | 192 | } |
193 | } | 193 | } |
194 | return (long)wp - (long)tag; | 194 | return (intptr_t)wp - (intptr_t)tag; |
195 | } | 195 | } |
196 | 196 | ||
197 | static int unsynchronize_frame(char* tag, int len) | 197 | static int unsynchronize_frame(char* tag, int len) |
@@ -562,7 +562,7 @@ static int unicode_munge(char* string, char* utf8buf, int *len) { | |||
562 | (*len)--; | 562 | (*len)--; |
563 | utf8 = iso_decode(str, utf8, -1, *len); | 563 | utf8 = iso_decode(str, utf8, -1, *len); |
564 | *utf8 = 0; | 564 | *utf8 = 0; |
565 | *len = (unsigned long)utf8 - (unsigned long)utf8buf; | 565 | *len = (intptr_t)utf8 - (intptr_t)utf8buf; |
566 | break; | 566 | break; |
567 | 567 | ||
568 | case 0x01: /* Unicode with or without BOM */ | 568 | case 0x01: /* Unicode with or without BOM */ |
@@ -619,7 +619,7 @@ static int unicode_munge(char* string, char* utf8buf, int *len) { | |||
619 | default: /* Plain old string */ | 619 | default: /* Plain old string */ |
620 | utf8 = iso_decode(str, utf8, -1, *len); | 620 | utf8 = iso_decode(str, utf8, -1, *len); |
621 | *utf8 = 0; | 621 | *utf8 = 0; |
622 | *len = (unsigned long)utf8 - (unsigned long)utf8buf; | 622 | *len = (intptr_t)utf8 - (intptr_t)utf8buf; |
623 | break; | 623 | break; |
624 | } | 624 | } |
625 | return 0; | 625 | return 0; |
diff --git a/lib/tlsf/src/tlsf.c b/lib/tlsf/src/tlsf.c index 6866f0c9b0..136c4152c0 100644 --- a/lib/tlsf/src/tlsf.c +++ b/lib/tlsf/src/tlsf.c | |||
@@ -54,6 +54,7 @@ | |||
54 | 54 | ||
55 | #include <stdio.h> | 55 | #include <stdio.h> |
56 | #include <string.h> | 56 | #include <string.h> |
57 | #include <stdint.h> | ||
57 | 58 | ||
58 | #ifndef TLSF_USE_LOCKS | 59 | #ifndef TLSF_USE_LOCKS |
59 | #define TLSF_USE_LOCKS (0) | 60 | #define TLSF_USE_LOCKS (0) |
@@ -462,7 +463,7 @@ size_t init_memory_pool(size_t mem_pool_size, void *mem_pool) | |||
462 | return -1; | 463 | return -1; |
463 | } | 464 | } |
464 | 465 | ||
465 | if (((unsigned long) mem_pool & PTR_MASK)) { | 466 | if (((intptr_t) mem_pool & PTR_MASK)) { |
466 | ERROR_MSG("init_memory_pool (): mem_pool must be aligned to a word\n"); | 467 | ERROR_MSG("init_memory_pool (): mem_pool must be aligned to a word\n"); |
467 | return -1; | 468 | return -1; |
468 | } | 469 | } |
@@ -522,7 +523,7 @@ size_t add_new_area(void *area, size_t area_size, void *mem_pool) | |||
522 | lb1 = ptr->end; | 523 | lb1 = ptr->end; |
523 | 524 | ||
524 | /* Merging the new area with the next physically contigous one */ | 525 | /* Merging the new area with the next physically contigous one */ |
525 | if ((unsigned long) ib1 == (unsigned long) lb0 + BHDR_OVERHEAD) { | 526 | if ((uintptr_t) ib1 == (uintptr_t) lb0 + BHDR_OVERHEAD) { |
526 | if (tlsf->area_head == ptr) { | 527 | if (tlsf->area_head == ptr) { |
527 | tlsf->area_head = ptr->next; | 528 | tlsf->area_head = ptr->next; |
528 | ptr = ptr->next; | 529 | ptr = ptr->next; |
@@ -543,7 +544,7 @@ size_t add_new_area(void *area, size_t area_size, void *mem_pool) | |||
543 | 544 | ||
544 | /* Merging the new area with the previous physically contigous | 545 | /* Merging the new area with the previous physically contigous |
545 | one */ | 546 | one */ |
546 | if ((unsigned long) lb1->ptr.buffer == (unsigned long) ib0) { | 547 | if ((intptr_t) lb1->ptr.buffer == (intptr_t) ib0) { |
547 | if (tlsf->area_head == ptr) { | 548 | if (tlsf->area_head == ptr) { |
548 | tlsf->area_head = ptr->next; | 549 | tlsf->area_head = ptr->next; |
549 | ptr = ptr->next; | 550 | ptr = ptr->next; |