From f452b6daafd04f186fe10c9b199a636e4450ff38 Mon Sep 17 00:00:00 2001 From: David Reid Date: Tue, 7 Aug 2018 18:28:57 +1000 Subject: [PATCH] Update extras. --- extras/dr_flac.h | 15 ++++++--------- extras/dr_mp3.h | 7 +++++-- extras/dr_wav.h | 7 +++++-- 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/extras/dr_flac.h b/extras/dr_flac.h index df90b01a..bb743393 100644 --- a/extras/dr_flac.h +++ b/extras/dr_flac.h @@ -1,5 +1,5 @@ // FLAC audio decoder. Public domain. See "unlicense" statement at the end of this file. -// dr_flac - v0.9.9 - 2018-08-05 +// dr_flac - v0.9.10 - 2018-08-07 // // David Reid - mackron@gmail.com @@ -157,16 +157,10 @@ extern "C" { #endif // Check if we can enable 64-bit optimizations. -#if defined(_WIN64) +#if defined(_WIN64) || defined(_LP64) || defined(__LP64__) #define DRFLAC_64BIT #endif -#if defined(__GNUC__) -#if defined(__x86_64__) || defined(__ppc64__) || defined(__aarch64__) -#define DRFLAC_64BIT -#endif -#endif - #ifdef DRFLAC_64BIT typedef drflac_uint64 drflac_cache_t; #else @@ -5756,8 +5750,11 @@ const char* drflac_next_vorbis_comment(drflac_vorbis_comment_iterator* pIter, dr // REVISION HISTORY // +// v0.9.10 - 2018-08-07 +// - Improve 64-bit detection. +// // v0.9.9 - 2018-08-05 -// - Fix C++ build on older versions of GCC. +// - Fix C++ build on older versions of GCC. // // v0.9.8 - 2018-07-24 // - Fix compilation errors. diff --git a/extras/dr_mp3.h b/extras/dr_mp3.h index d75dc108..4505b750 100644 --- a/extras/dr_mp3.h +++ b/extras/dr_mp3.h @@ -1,5 +1,5 @@ // MP3 audio decoder. Public domain. See "unlicense" statement at the end of this file. -// dr_mp3 - v0.2.9 - 2018-08-05 +// dr_mp3 - v0.2.10 - 2018-08-07 // // David Reid - mackron@gmail.com // @@ -1987,7 +1987,7 @@ int drmp3dec_decode_frame(drmp3dec *dec, const unsigned char *mp3, int mp3_bytes #if defined(SIZE_MAX) #define DRMP3_SIZE_MAX SIZE_MAX #else - #if defined(_WIN64) || defined(__ppc64__) || defined(__x86_64__) || defined(_M_X64) || defined(_M_ARM64) || defined(__aarch64__) + #if defined(_WIN64) || defined(_LP64) || defined(__LP64__) #define DRMP3_SIZE_MAX ((drmp3_uint64)0xFFFFFFFFFFFFFFFF) #else #define DRMP3_SIZE_MAX 0xFFFFFFFF @@ -2761,6 +2761,9 @@ void drmp3_free(void* p) // REVISION HISTORY // =============== // +// v0.2.10 - 2018-08-07 +// - Improve 64-bit detection. +// // v0.2.9 - 2018-08-05 // - Fix C++ build on older versions of GCC. // - Bring up to date with minimp3. diff --git a/extras/dr_wav.h b/extras/dr_wav.h index dc5cd55b..c13a98db 100644 --- a/extras/dr_wav.h +++ b/extras/dr_wav.h @@ -1,5 +1,5 @@ // WAV audio loader and writer. Public domain. See "unlicense" statement at the end of this file. -// dr_wav - v0.8.3 - 2018-08-05 +// dr_wav - v0.8.4 - 2018-08-07 // // David Reid - mackron@gmail.com @@ -743,7 +743,7 @@ void drwav_free(void* pDataReturnedByOpenAndRead); #if defined(SIZE_MAX) #define DRWAV_SIZE_MAX SIZE_MAX #else - #if defined(_WIN64) || defined(__ppc64__) || defined(__x86_64__) || defined(_M_X64) || defined(_M_ARM64) || defined(__aarch64__) + #if defined(_WIN64) || defined(_LP64) || defined(__LP64__) #define DRWAV_SIZE_MAX ((drwav_uint64)0xFFFFFFFFFFFFFFFF) #else #define DRWAV_SIZE_MAX 0xFFFFFFFF @@ -3581,6 +3581,9 @@ void drwav_free(void* pDataReturnedByOpenAndRead) // REVISION HISTORY // +// v0.8.4 - 2018-08-07 +// - Improve 64-bit detection. +// // v0.8.3 - 2018-08-05 // - Fix C++ build on older versions of GCC. //