diff options
| author | ftrvxmtrx <ftrvxmtrx@gmail.com> | 2016-03-05 10:32:47 +0100 |
|---|---|---|
| committer | ftrvxmtrx <ftrvxmtrx@gmail.com> | 2016-03-05 10:32:47 +0100 |
| commit | 2d2ffac86f788ac6bed73d873f837bbd9849a2e4 (patch) | |
| tree | b3a2b7ebf1491b6a8ca9cc1b2eb059c51cf39d86 /sys/src/cmd/audio/libFLAC/private/memory.h | |
| parent | 897da507f4efdf67afb3b589cb9240fe217545af (diff) | |
libFLAC: update to 1.3.1
Diffstat (limited to 'sys/src/cmd/audio/libFLAC/private/memory.h')
| -rw-r--r-- | sys/src/cmd/audio/libFLAC/private/memory.h | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/sys/src/cmd/audio/libFLAC/private/memory.h b/sys/src/cmd/audio/libFLAC/private/memory.h index 0445ba018..c9f27129e 100644 --- a/sys/src/cmd/audio/libFLAC/private/memory.h +++ b/sys/src/cmd/audio/libFLAC/private/memory.h @@ -1,5 +1,6 @@ /* libFLAC - Free Lossless Audio Codec library - * Copyright (C) 2001,2002,2003,2004 Josh Coalson + * Copyright (C) 2001-2009 Josh Coalson + * Copyright (C) 2011-2014 Xiph.Org Foundation * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -32,18 +33,26 @@ #ifndef FLAC__PRIVATE__MEMORY_H #define FLAC__PRIVATE__MEMORY_H +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include <stdlib.h> /* for size_t */ +#include "private/float.h" #include "FLAC/ordinals.h" /* for FLAC__bool */ /* Returns the unaligned address returned by malloc. * Use free() on this address to deallocate. */ void *FLAC__memory_alloc_aligned(size_t bytes, void **aligned_address); -FLAC__bool FLAC__memory_alloc_aligned_int32_array(unsigned elements, FLAC__int32 **unaligned_pointer, FLAC__int32 **aligned_pointer); -FLAC__bool FLAC__memory_alloc_aligned_uint32_array(unsigned elements, FLAC__uint32 **unaligned_pointer, FLAC__uint32 **aligned_pointer); -FLAC__bool FLAC__memory_alloc_aligned_uint64_array(unsigned elements, FLAC__uint64 **unaligned_pointer, FLAC__uint64 **aligned_pointer); -FLAC__bool FLAC__memory_alloc_aligned_unsigned_array(unsigned elements, unsigned **unaligned_pointer, unsigned **aligned_pointer); -FLAC__bool FLAC__memory_alloc_aligned_real_array(unsigned elements, FLAC__real **unaligned_pointer, FLAC__real **aligned_pointer); +FLAC__bool FLAC__memory_alloc_aligned_int32_array(size_t elements, FLAC__int32 **unaligned_pointer, FLAC__int32 **aligned_pointer); +FLAC__bool FLAC__memory_alloc_aligned_uint32_array(size_t elements, FLAC__uint32 **unaligned_pointer, FLAC__uint32 **aligned_pointer); +FLAC__bool FLAC__memory_alloc_aligned_uint64_array(size_t elements, FLAC__uint64 **unaligned_pointer, FLAC__uint64 **aligned_pointer); +FLAC__bool FLAC__memory_alloc_aligned_unsigned_array(size_t elements, unsigned **unaligned_pointer, unsigned **aligned_pointer); +#ifndef FLAC__INTEGER_ONLY_LIBRARY +FLAC__bool FLAC__memory_alloc_aligned_real_array(size_t elements, FLAC__real **unaligned_pointer, FLAC__real **aligned_pointer); +#endif +void *safe_malloc_mul_2op_p(size_t size1, size_t size2); #endif |