Fix building when configured with --disable-shared.

[platform/upstream/flac.git] / src / libFLAC / memory.c

diff --git a/src/libFLAC/memory.c b/src/libFLAC/memory.c
index 8870efe..3207774 100644 (file)
--- a/src/libFLAC/memory.c
+++ b/src/libFLAC/memory.c
@@ -87,7 +87,7 @@ FLAC__bool FLAC__memory_alloc_aligned_int32_array(size_t elements, FLAC__int32 *
        if(elements > SIZE_MAX / sizeof(*pu)) /* overflow check */
                return false;
 
-       pu = (FLAC__int32*)FLAC__memory_alloc_aligned(sizeof(*pu) * elements, &u.pv);
+       pu = FLAC__memory_alloc_aligned(sizeof(*pu) * elements, &u.pv);
        if(0 == pu) {
                return false;
        }
@@ -116,7 +116,7 @@ FLAC__bool FLAC__memory_alloc_aligned_uint32_array(size_t elements, FLAC__uint32
        if(elements > SIZE_MAX / sizeof(*pu)) /* overflow check */
                return false;
 
-       pu = (FLAC__uint32*)FLAC__memory_alloc_aligned(sizeof(*pu) * elements, &u.pv);
+       pu = FLAC__memory_alloc_aligned(sizeof(*pu) * elements, &u.pv);
        if(0 == pu) {
                return false;
        }
@@ -145,7 +145,7 @@ FLAC__bool FLAC__memory_alloc_aligned_uint64_array(size_t elements, FLAC__uint64
        if(elements > SIZE_MAX / sizeof(*pu)) /* overflow check */
                return false;
 
-       pu = (FLAC__uint64*)FLAC__memory_alloc_aligned(sizeof(*pu) * elements, &u.pv);
+       pu = FLAC__memory_alloc_aligned(sizeof(*pu) * elements, &u.pv);
        if(0 == pu) {
                return false;
        }
@@ -174,7 +174,7 @@ FLAC__bool FLAC__memory_alloc_aligned_unsigned_array(size_t elements, unsigned *
        if(elements > SIZE_MAX / sizeof(*pu)) /* overflow check */
                return false;
 
-       pu = (unsigned*)FLAC__memory_alloc_aligned(sizeof(*pu) * elements, &u.pv);
+       pu = FLAC__memory_alloc_aligned(sizeof(*pu) * elements, &u.pv);
        if(0 == pu) {
                return false;
        }
@@ -205,7 +205,7 @@ FLAC__bool FLAC__memory_alloc_aligned_real_array(size_t elements, FLAC__real **u
        if(elements > SIZE_MAX / sizeof(*pu)) /* overflow check */
                return false;
 
-       pu = (FLAC__real*)FLAC__memory_alloc_aligned(sizeof(*pu) * elements, &u.pv);
+       pu = FLAC__memory_alloc_aligned(sizeof(*pu) * elements, &u.pv);
        if(0 == pu) {
                return false;
        }
@@ -220,7 +220,7 @@ FLAC__bool FLAC__memory_alloc_aligned_real_array(size_t elements, FLAC__real **u
 
 #endif
 
-void *safe_malloc_mul_2op_(size_t size1, size_t size2)
+void *safe_malloc_mul_2op_p(size_t size1, size_t size2)
 {
        if(!size1 || !size2)
                return malloc(1); /* malloc(0) is undefined; FLAC src convention is to always allocate */