From fef3160a5b2e2d3dd35ab81c8c66d1c6f334c3f8 Mon Sep 17 00:00:00 2001 From: attila Date: Wed, 8 Nov 2023 17:39:12 +0100 Subject: [PATCH] FLAC: Retarget header includes in 1.4.3 lib files --- .../codecs/flac_143/alloc.h | 2 +- .../codecs/flac_143/compat.h | 2 +- .../codecs/flac_143/libFLAC/bitmath.c | 2 +- .../codecs/flac_143/libFLAC/bitreader.c | 16 +++---- .../codecs/flac_143/libFLAC/bitwriter.c | 18 ++++---- .../codecs/flac_143/libFLAC/cpu.c | 4 +- .../codecs/flac_143/libFLAC/crc.c | 2 +- .../codecs/flac_143/libFLAC/fixed.c | 10 ++--- .../codecs/flac_143/libFLAC/float.c | 6 +-- .../codecs/flac_143/libFLAC/format.c | 12 +++--- .../libFLAC/include/private/bitmath.h | 6 +-- .../libFLAC/include/private/bitreader.h | 2 +- .../libFLAC/include/private/bitwriter.h | 2 +- .../flac_143/libFLAC/include/private/cpu.h | 2 +- .../flac_143/libFLAC/include/private/crc.h | 2 +- .../flac_143/libFLAC/include/private/fixed.h | 6 +-- .../flac_143/libFLAC/include/private/float.h | 2 +- .../flac_143/libFLAC/include/private/format.h | 2 +- .../flac_143/libFLAC/include/private/lpc.h | 6 +-- .../flac_143/libFLAC/include/private/md5.h | 2 +- .../flac_143/libFLAC/include/private/memory.h | 4 +- .../libFLAC/include/private/stream_encoder.h | 4 +- .../include/private/stream_encoder_framing.h | 2 +- .../flac_143/libFLAC/include/private/window.h | 4 +- .../include/protected/stream_decoder.h | 4 +- .../include/protected/stream_encoder.h | 6 +-- .../codecs/flac_143/libFLAC/lpc.c | 12 +++--- .../codecs/flac_143/libFLAC/lpc_intrin_neon.c | 10 ++--- .../codecs/flac_143/libFLAC/md5.c | 8 ++-- .../codecs/flac_143/libFLAC/memory.c | 8 ++-- .../codecs/flac_143/libFLAC/stream_decoder.c | 28 ++++++------- .../codecs/flac_143/libFLAC/stream_encoder.c | 42 +++++++++---------- .../flac_143/libFLAC/stream_encoder_framing.c | 8 ++-- .../codecs/flac_143/libFLAC/window.c | 8 ++-- 34 files changed, 127 insertions(+), 127 deletions(-) diff --git a/modules/juce_audio_formats/codecs/flac_143/alloc.h b/modules/juce_audio_formats/codecs/flac_143/alloc.h index b746ae99bf..ed226b65c0 100644 --- a/modules/juce_audio_formats/codecs/flac_143/alloc.h +++ b/modules/juce_audio_formats/codecs/flac_143/alloc.h @@ -46,7 +46,7 @@ #include /* for SIZE_MAX in case limits.h didn't get it */ #endif #include /* for size_t, malloc(), etc */ -#include "share/compat.h" +#include "compat.h" #ifndef SIZE_MAX # ifndef SIZE_T_MAX diff --git a/modules/juce_audio_formats/codecs/flac_143/compat.h b/modules/juce_audio_formats/codecs/flac_143/compat.h index 2e55e57fbb..681f976466 100644 --- a/modules/juce_audio_formats/codecs/flac_143/compat.h +++ b/modules/juce_audio_formats/codecs/flac_143/compat.h @@ -173,7 +173,7 @@ #ifdef _WIN32 /* All char* strings are in UTF-8 format. Added to support Unicode files on Windows */ -#include "share/win_utf8_io.h" +#include "win_utf8_io.h" #define flac_printf printf_utf8 #define flac_fprintf fprintf_utf8 #define flac_vfprintf vfprintf_utf8 diff --git a/modules/juce_audio_formats/codecs/flac_143/libFLAC/bitmath.c b/modules/juce_audio_formats/codecs/flac_143/libFLAC/bitmath.c index b85ccde234..5c63fa23b1 100644 --- a/modules/juce_audio_formats/codecs/flac_143/libFLAC/bitmath.c +++ b/modules/juce_audio_formats/codecs/flac_143/libFLAC/bitmath.c @@ -34,7 +34,7 @@ # include #endif -#include "private/bitmath.h" +#include "include/private/bitmath.h" /* An example of what FLAC__bitmath_silog2() computes: * diff --git a/modules/juce_audio_formats/codecs/flac_143/libFLAC/bitreader.c b/modules/juce_audio_formats/codecs/flac_143/libFLAC/bitreader.c index 389519f6be..e2da02b649 100644 --- a/modules/juce_audio_formats/codecs/flac_143/libFLAC/bitreader.c +++ b/modules/juce_audio_formats/codecs/flac_143/libFLAC/bitreader.c @@ -36,14 +36,14 @@ #include #include -#include "private/bitmath.h" -#include "private/bitreader.h" -#include "private/crc.h" -#include "private/cpu.h" -#include "private/macros.h" -#include "FLAC/assert.h" -#include "share/compat.h" -#include "share/endswap.h" +#include "include/private/bitmath.h" +#include "include/private/bitreader.h" +#include "include/private/crc.h" +#include "include/private/cpu.h" + +#include "../assert.h" +#include "../compat.h" +#include "../endswap.h" /* Things should be fastest when this matches the machine word size */ /* WATCHOUT: if you change this you must also change the following #defines down to COUNT_ZERO_MSBS2 below to match */ diff --git a/modules/juce_audio_formats/codecs/flac_143/libFLAC/bitwriter.c b/modules/juce_audio_formats/codecs/flac_143/libFLAC/bitwriter.c index 30e1ef519e..512d0e7391 100644 --- a/modules/juce_audio_formats/codecs/flac_143/libFLAC/bitwriter.c +++ b/modules/juce_audio_formats/codecs/flac_143/libFLAC/bitwriter.c @@ -36,15 +36,15 @@ #include #include -#include "private/bitwriter.h" -#include "private/crc.h" -#include "private/format.h" -#include "private/macros.h" -#include "private/stream_encoder.h" -#include "FLAC/assert.h" -#include "share/alloc.h" -#include "share/compat.h" -#include "share/endswap.h" +#include "include/private/bitwriter.h" +#include "include/private/crc.h" +#include "include/private/format.h" + +#include "include/private/stream_encoder.h" +#include "../assert.h" +#include "../alloc.h" +#include "../compat.h" +#include "../endswap.h" /* Things should be fastest when this matches the machine word size */ /* WATCHOUT: if you change this you must also change the following #defines down to SWAP_BE_WORD_TO_HOST below to match */ diff --git a/modules/juce_audio_formats/codecs/flac_143/libFLAC/cpu.c b/modules/juce_audio_formats/codecs/flac_143/libFLAC/cpu.c index fd465fdedb..7ed1fc43ba 100644 --- a/modules/juce_audio_formats/codecs/flac_143/libFLAC/cpu.c +++ b/modules/juce_audio_formats/codecs/flac_143/libFLAC/cpu.c @@ -34,8 +34,8 @@ # include #endif -#include "private/cpu.h" -#include "share/compat.h" +#include "include/private/cpu.h" +#include "../compat.h" #include #include diff --git a/modules/juce_audio_formats/codecs/flac_143/libFLAC/crc.c b/modules/juce_audio_formats/codecs/flac_143/libFLAC/crc.c index fbe6395d6c..c8ab234168 100644 --- a/modules/juce_audio_formats/codecs/flac_143/libFLAC/crc.c +++ b/modules/juce_audio_formats/codecs/flac_143/libFLAC/crc.c @@ -34,7 +34,7 @@ # include #endif -#include "private/crc.h" +#include "include/private/crc.h" /* CRC-8, poly = x^8 + x^2 + x^1 + x^0, init = 0 */ diff --git a/modules/juce_audio_formats/codecs/flac_143/libFLAC/fixed.c b/modules/juce_audio_formats/codecs/flac_143/libFLAC/fixed.c index 6333a3355c..23028fbd0e 100644 --- a/modules/juce_audio_formats/codecs/flac_143/libFLAC/fixed.c +++ b/modules/juce_audio_formats/codecs/flac_143/libFLAC/fixed.c @@ -36,11 +36,11 @@ #include #include -#include "share/compat.h" -#include "private/bitmath.h" -#include "private/fixed.h" -#include "private/macros.h" -#include "FLAC/assert.h" +#include "../compat.h" +#include "include/private/bitmath.h" +#include "include/private/fixed.h" + +#include "../assert.h" #ifdef local_abs #undef local_abs diff --git a/modules/juce_audio_formats/codecs/flac_143/libFLAC/float.c b/modules/juce_audio_formats/codecs/flac_143/libFLAC/float.c index 2674a876e7..dfa7c9377e 100644 --- a/modules/juce_audio_formats/codecs/flac_143/libFLAC/float.c +++ b/modules/juce_audio_formats/codecs/flac_143/libFLAC/float.c @@ -34,9 +34,9 @@ # include #endif -#include "FLAC/assert.h" -#include "share/compat.h" -#include "private/float.h" +#include "../assert.h" +#include "../compat.h" +#include "include/private/float.h" #ifdef FLAC__INTEGER_ONLY_LIBRARY diff --git a/modules/juce_audio_formats/codecs/flac_143/libFLAC/format.c b/modules/juce_audio_formats/codecs/flac_143/libFLAC/format.c index 72c06361da..22d5c7e077 100644 --- a/modules/juce_audio_formats/codecs/flac_143/libFLAC/format.c +++ b/modules/juce_audio_formats/codecs/flac_143/libFLAC/format.c @@ -37,12 +37,12 @@ #include #include /* for qsort() */ #include /* for memset() */ -#include "FLAC/assert.h" -#include "FLAC/format.h" -#include "share/alloc.h" -#include "share/compat.h" -#include "private/format.h" -#include "private/macros.h" +#include "../assert.h" +#include "../format.h" +#include "../alloc.h" +#include "../compat.h" +#include "include/private/format.h" + #if (defined GIT_COMMIT_HASH && defined GIT_COMMIT_DATE) # ifdef GIT_COMMIT_TAG diff --git a/modules/juce_audio_formats/codecs/flac_143/libFLAC/include/private/bitmath.h b/modules/juce_audio_formats/codecs/flac_143/libFLAC/include/private/bitmath.h index f61a5409cf..69ddc357a8 100644 --- a/modules/juce_audio_formats/codecs/flac_143/libFLAC/include/private/bitmath.h +++ b/modules/juce_audio_formats/codecs/flac_143/libFLAC/include/private/bitmath.h @@ -33,10 +33,10 @@ #ifndef FLAC__PRIVATE__BITMATH_H #define FLAC__PRIVATE__BITMATH_H -#include "FLAC/ordinals.h" -#include "FLAC/assert.h" +#include "../../../ordinals.h" +#include "../../../assert.h" -#include "share/compat.h" +#include "../../../compat.h" #if defined(_MSC_VER) #include /* for _BitScanReverse* */ diff --git a/modules/juce_audio_formats/codecs/flac_143/libFLAC/include/private/bitreader.h b/modules/juce_audio_formats/codecs/flac_143/libFLAC/include/private/bitreader.h index 34c7b787a3..408f7d3a91 100644 --- a/modules/juce_audio_formats/codecs/flac_143/libFLAC/include/private/bitreader.h +++ b/modules/juce_audio_formats/codecs/flac_143/libFLAC/include/private/bitreader.h @@ -34,7 +34,7 @@ #define FLAC__PRIVATE__BITREADER_H #include /* for FILE */ -#include "FLAC/ordinals.h" +#include "../../../ordinals.h" #include "cpu.h" /* diff --git a/modules/juce_audio_formats/codecs/flac_143/libFLAC/include/private/bitwriter.h b/modules/juce_audio_formats/codecs/flac_143/libFLAC/include/private/bitwriter.h index 6dff2bdc27..8b41de9dd2 100644 --- a/modules/juce_audio_formats/codecs/flac_143/libFLAC/include/private/bitwriter.h +++ b/modules/juce_audio_formats/codecs/flac_143/libFLAC/include/private/bitwriter.h @@ -34,7 +34,7 @@ #define FLAC__PRIVATE__BITWRITER_H #include /* for FILE */ -#include "FLAC/ordinals.h" +#include "../../../ordinals.h" /* * opaque structure definition diff --git a/modules/juce_audio_formats/codecs/flac_143/libFLAC/include/private/cpu.h b/modules/juce_audio_formats/codecs/flac_143/libFLAC/include/private/cpu.h index a8b13c4def..e1b16fbd09 100644 --- a/modules/juce_audio_formats/codecs/flac_143/libFLAC/include/private/cpu.h +++ b/modules/juce_audio_formats/codecs/flac_143/libFLAC/include/private/cpu.h @@ -33,7 +33,7 @@ #ifndef FLAC__PRIVATE__CPU_H #define FLAC__PRIVATE__CPU_H -#include "FLAC/ordinals.h" +#include "../../../ordinals.h" #ifdef HAVE_CONFIG_H #include diff --git a/modules/juce_audio_formats/codecs/flac_143/libFLAC/include/private/crc.h b/modules/juce_audio_formats/codecs/flac_143/libFLAC/include/private/crc.h index 48ce780372..9f62aedafe 100644 --- a/modules/juce_audio_formats/codecs/flac_143/libFLAC/include/private/crc.h +++ b/modules/juce_audio_formats/codecs/flac_143/libFLAC/include/private/crc.h @@ -33,7 +33,7 @@ #ifndef FLAC__PRIVATE__CRC_H #define FLAC__PRIVATE__CRC_H -#include "FLAC/ordinals.h" +#include "../../../ordinals.h" /* 8 bit CRC generator, MSB shifted first ** polynomial = x^8 + x^2 + x^1 + x^0 diff --git a/modules/juce_audio_formats/codecs/flac_143/libFLAC/include/private/fixed.h b/modules/juce_audio_formats/codecs/flac_143/libFLAC/include/private/fixed.h index 599ecd6fa2..866f110c59 100644 --- a/modules/juce_audio_formats/codecs/flac_143/libFLAC/include/private/fixed.h +++ b/modules/juce_audio_formats/codecs/flac_143/libFLAC/include/private/fixed.h @@ -37,9 +37,9 @@ #include #endif -#include "private/cpu.h" -#include "private/float.h" -#include "FLAC/format.h" +#include "cpu.h" +#include "float.h" +#include "../../../format.h" /* * FLAC__fixed_compute_best_predictor() diff --git a/modules/juce_audio_formats/codecs/flac_143/libFLAC/include/private/float.h b/modules/juce_audio_formats/codecs/flac_143/libFLAC/include/private/float.h index 8a9c0731a2..649de9e760 100644 --- a/modules/juce_audio_formats/codecs/flac_143/libFLAC/include/private/float.h +++ b/modules/juce_audio_formats/codecs/flac_143/libFLAC/include/private/float.h @@ -37,7 +37,7 @@ #include #endif -#include "FLAC/ordinals.h" +#include "../../../ordinals.h" /* * All the code in libFLAC that uses float and double diff --git a/modules/juce_audio_formats/codecs/flac_143/libFLAC/include/private/format.h b/modules/juce_audio_formats/codecs/flac_143/libFLAC/include/private/format.h index fda798db56..4cd03fdbe7 100644 --- a/modules/juce_audio_formats/codecs/flac_143/libFLAC/include/private/format.h +++ b/modules/juce_audio_formats/codecs/flac_143/libFLAC/include/private/format.h @@ -33,7 +33,7 @@ #ifndef FLAC__PRIVATE__FORMAT_H #define FLAC__PRIVATE__FORMAT_H -#include "FLAC/format.h" +#include "../../../format.h" #if 0 /* UNUSED */ uint32_t FLAC__format_get_max_rice_partition_order(uint32_t blocksize, uint32_t predictor_order); diff --git a/modules/juce_audio_formats/codecs/flac_143/libFLAC/include/private/lpc.h b/modules/juce_audio_formats/codecs/flac_143/libFLAC/include/private/lpc.h index d8930b64ab..7cb05a151d 100644 --- a/modules/juce_audio_formats/codecs/flac_143/libFLAC/include/private/lpc.h +++ b/modules/juce_audio_formats/codecs/flac_143/libFLAC/include/private/lpc.h @@ -37,9 +37,9 @@ #include #endif -#include "private/cpu.h" -#include "private/float.h" -#include "FLAC/format.h" +#include "cpu.h" +#include "float.h" +#include "../../../format.h" #ifndef FLAC__INTEGER_ONLY_LIBRARY diff --git a/modules/juce_audio_formats/codecs/flac_143/libFLAC/include/private/md5.h b/modules/juce_audio_formats/codecs/flac_143/libFLAC/include/private/md5.h index 1a2195f61a..57be3bf865 100644 --- a/modules/juce_audio_formats/codecs/flac_143/libFLAC/include/private/md5.h +++ b/modules/juce_audio_formats/codecs/flac_143/libFLAC/include/private/md5.h @@ -26,7 +26,7 @@ * Still in the public domain, with no warranty. */ -#include "FLAC/ordinals.h" +#include "../../../ordinals.h" typedef union { FLAC__byte *p8; diff --git a/modules/juce_audio_formats/codecs/flac_143/libFLAC/include/private/memory.h b/modules/juce_audio_formats/codecs/flac_143/libFLAC/include/private/memory.h index cb25a5ab14..bb7853f287 100644 --- a/modules/juce_audio_formats/codecs/flac_143/libFLAC/include/private/memory.h +++ b/modules/juce_audio_formats/codecs/flac_143/libFLAC/include/private/memory.h @@ -39,8 +39,8 @@ #include /* for size_t */ -#include "private/float.h" -#include "FLAC/ordinals.h" /* for FLAC__bool */ +#include "float.h" +#include "../../../ordinals.h" /* for FLAC__bool */ /* Returns the unaligned address returned by malloc. * Use free() on this address to deallocate. diff --git a/modules/juce_audio_formats/codecs/flac_143/libFLAC/include/private/stream_encoder.h b/modules/juce_audio_formats/codecs/flac_143/libFLAC/include/private/stream_encoder.h index a8b8c28206..36bbc24c1e 100644 --- a/modules/juce_audio_formats/codecs/flac_143/libFLAC/include/private/stream_encoder.h +++ b/modules/juce_audio_formats/codecs/flac_143/libFLAC/include/private/stream_encoder.h @@ -44,8 +44,8 @@ #define FLAC__MAX_EXTRA_RESIDUAL_BPS 4 #if (defined FLAC__CPU_IA32 || defined FLAC__CPU_X86_64) && defined FLAC__HAS_X86INTRIN -#include "private/cpu.h" -#include "FLAC/format.h" +#include "cpu.h" +#include "../../../format.h" #ifdef FLAC__SSE2_SUPPORTED extern void FLAC__precompute_partition_info_sums_intrin_sse2(const FLAC__int32 residual[], FLAC__uint64 abs_residual_partition_sums[], diff --git a/modules/juce_audio_formats/codecs/flac_143/libFLAC/include/private/stream_encoder_framing.h b/modules/juce_audio_formats/codecs/flac_143/libFLAC/include/private/stream_encoder_framing.h index 39d11e2e59..9e55f3095b 100644 --- a/modules/juce_audio_formats/codecs/flac_143/libFLAC/include/private/stream_encoder_framing.h +++ b/modules/juce_audio_formats/codecs/flac_143/libFLAC/include/private/stream_encoder_framing.h @@ -33,7 +33,7 @@ #ifndef FLAC__PRIVATE__STREAM_ENCODER_FRAMING_H #define FLAC__PRIVATE__STREAM_ENCODER_FRAMING_H -#include "FLAC/format.h" +#include "../../../format.h" #include "bitwriter.h" FLAC__bool FLAC__add_metadata_block(const FLAC__StreamMetadata *metadata, FLAC__BitWriter *bw, FLAC__bool update_vendor_string); diff --git a/modules/juce_audio_formats/codecs/flac_143/libFLAC/include/private/window.h b/modules/juce_audio_formats/codecs/flac_143/libFLAC/include/private/window.h index cc1006b7e5..512140a380 100644 --- a/modules/juce_audio_formats/codecs/flac_143/libFLAC/include/private/window.h +++ b/modules/juce_audio_formats/codecs/flac_143/libFLAC/include/private/window.h @@ -37,8 +37,8 @@ #include #endif -#include "private/float.h" -#include "FLAC/format.h" +#include "float.h" +#include "../../../format.h" #ifndef FLAC__INTEGER_ONLY_LIBRARY diff --git a/modules/juce_audio_formats/codecs/flac_143/libFLAC/include/protected/stream_decoder.h b/modules/juce_audio_formats/codecs/flac_143/libFLAC/include/protected/stream_decoder.h index cc22a9d9f3..8c7794b7a2 100644 --- a/modules/juce_audio_formats/codecs/flac_143/libFLAC/include/protected/stream_decoder.h +++ b/modules/juce_audio_formats/codecs/flac_143/libFLAC/include/protected/stream_decoder.h @@ -33,9 +33,9 @@ #ifndef FLAC__PROTECTED__STREAM_DECODER_H #define FLAC__PROTECTED__STREAM_DECODER_H -#include "FLAC/stream_decoder.h" +#include "../../../stream_decoder.h" #if FLAC__HAS_OGG -#include "private/ogg_decoder_aspect.h" +#include "../private/ogg_decoder_aspect.h" #endif typedef struct FLAC__StreamDecoderProtected { diff --git a/modules/juce_audio_formats/codecs/flac_143/libFLAC/include/protected/stream_encoder.h b/modules/juce_audio_formats/codecs/flac_143/libFLAC/include/protected/stream_encoder.h index 4c75caedae..0354fb0b24 100644 --- a/modules/juce_audio_formats/codecs/flac_143/libFLAC/include/protected/stream_encoder.h +++ b/modules/juce_audio_formats/codecs/flac_143/libFLAC/include/protected/stream_encoder.h @@ -33,14 +33,14 @@ #ifndef FLAC__PROTECTED__STREAM_ENCODER_H #define FLAC__PROTECTED__STREAM_ENCODER_H -#include "FLAC/stream_encoder.h" +#include "../../../stream_encoder.h" #if FLAC__HAS_OGG -#include "private/ogg_encoder_aspect.h" +#include "../private/ogg_encoder_aspect.h" #endif #ifndef FLAC__INTEGER_ONLY_LIBRARY -#include "private/float.h" +#include "../private/float.h" #define FLAC__MAX_APODIZATION_FUNCTIONS 32 diff --git a/modules/juce_audio_formats/codecs/flac_143/libFLAC/lpc.c b/modules/juce_audio_formats/codecs/flac_143/libFLAC/lpc.c index b6ef3b5bd1..e86cd1134f 100644 --- a/modules/juce_audio_formats/codecs/flac_143/libFLAC/lpc.c +++ b/modules/juce_audio_formats/codecs/flac_143/libFLAC/lpc.c @@ -37,12 +37,12 @@ #include #include -#include "FLAC/assert.h" -#include "FLAC/format.h" -#include "share/compat.h" -#include "private/bitmath.h" -#include "private/lpc.h" -#include "private/macros.h" +#include "../assert.h" +#include "../format.h" +#include "../compat.h" +#include "include/private/bitmath.h" +#include "include/private/lpc.h" + #if !defined(NDEBUG) || defined FLAC__OVERFLOW_DETECT || defined FLAC__OVERFLOW_DETECT_VERBOSE #include diff --git a/modules/juce_audio_formats/codecs/flac_143/libFLAC/lpc_intrin_neon.c b/modules/juce_audio_formats/codecs/flac_143/libFLAC/lpc_intrin_neon.c index 8a1c434a63..48f8c800b4 100644 --- a/modules/juce_audio_formats/codecs/flac_143/libFLAC/lpc_intrin_neon.c +++ b/modules/juce_audio_formats/codecs/flac_143/libFLAC/lpc_intrin_neon.c @@ -30,15 +30,15 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "private/cpu.h" +#include "include/private/cpu.h" #ifndef FLAC__INTEGER_ONLY_LIBRARY #ifndef FLAC__NO_ASM #if defined FLAC__CPU_ARM64 && FLAC__HAS_NEONINTRIN -#include "private/lpc.h" -#include "FLAC/assert.h" -#include "FLAC/format.h" -#include "private/macros.h" +#include "include/private/lpc.h" +#include "../assert.h" +#include "../format.h" + #include #if FLAC__HAS_A64NEONINTRIN diff --git a/modules/juce_audio_formats/codecs/flac_143/libFLAC/md5.c b/modules/juce_audio_formats/codecs/flac_143/libFLAC/md5.c index 001c248e0b..ed15ba6d6c 100644 --- a/modules/juce_audio_formats/codecs/flac_143/libFLAC/md5.c +++ b/modules/juce_audio_formats/codecs/flac_143/libFLAC/md5.c @@ -5,10 +5,10 @@ #include /* for malloc() */ #include /* for memcpy() */ -#include "private/md5.h" -#include "share/alloc.h" -#include "share/compat.h" -#include "share/endswap.h" +#include "include/private/md5.h" +#include "../alloc.h" +#include "../compat.h" +#include "../endswap.h" /* * This code implements the MD5 message-digest algorithm. diff --git a/modules/juce_audio_formats/codecs/flac_143/libFLAC/memory.c b/modules/juce_audio_formats/codecs/flac_143/libFLAC/memory.c index 961b9cca2c..6771fd7bfa 100644 --- a/modules/juce_audio_formats/codecs/flac_143/libFLAC/memory.c +++ b/modules/juce_audio_formats/codecs/flac_143/libFLAC/memory.c @@ -38,10 +38,10 @@ #include #endif -#include "private/memory.h" -#include "FLAC/assert.h" -#include "share/compat.h" -#include "share/alloc.h" +#include "include/private/memory.h" +#include "../assert.h" +#include "../compat.h" +#include "../alloc.h" void *FLAC__memory_alloc_aligned(size_t bytes, void **aligned_address) { diff --git a/modules/juce_audio_formats/codecs/flac_143/libFLAC/stream_decoder.c b/modules/juce_audio_formats/codecs/flac_143/libFLAC/stream_decoder.c index 12ccd36692..7192bf32bb 100644 --- a/modules/juce_audio_formats/codecs/flac_143/libFLAC/stream_decoder.c +++ b/modules/juce_audio_formats/codecs/flac_143/libFLAC/stream_decoder.c @@ -39,20 +39,20 @@ #include /* for memset/memcpy() */ #include /* for off_t */ #include /* for stat() */ -#include "share/compat.h" -#include "FLAC/assert.h" -#include "share/alloc.h" -#include "protected/stream_decoder.h" -#include "private/bitreader.h" -#include "private/bitmath.h" -#include "private/cpu.h" -#include "private/crc.h" -#include "private/fixed.h" -#include "private/format.h" -#include "private/lpc.h" -#include "private/md5.h" -#include "private/memory.h" -#include "private/macros.h" +#include "../compat.h" +#include "../assert.h" +#include "../alloc.h" +#include "include/protected/stream_decoder.h" +#include "include/private/bitreader.h" +#include "include/private/bitmath.h" +#include "include/private/cpu.h" +#include "include/private/crc.h" +#include "include/private/fixed.h" +#include "include/private/format.h" +#include "include/private/lpc.h" +#include "include/private/md5.h" +#include "include/private/memory.h" + /* technically this should be in an "export.c" but this is convenient enough */ diff --git a/modules/juce_audio_formats/codecs/flac_143/libFLAC/stream_encoder.c b/modules/juce_audio_formats/codecs/flac_143/libFLAC/stream_encoder.c index 0d46ab80b3..333d16b88d 100644 --- a/modules/juce_audio_formats/codecs/flac_143/libFLAC/stream_encoder.c +++ b/modules/juce_audio_formats/codecs/flac_143/libFLAC/stream_encoder.c @@ -43,29 +43,29 @@ #include /* for GetFileType() */ #include /* for _get_osfhandle() */ #endif -#include "share/compat.h" -#include "FLAC/assert.h" -#include "FLAC/stream_decoder.h" -#include "protected/stream_encoder.h" -#include "private/bitwriter.h" -#include "private/bitmath.h" -#include "private/crc.h" -#include "private/cpu.h" -#include "private/fixed.h" -#include "private/format.h" -#include "private/lpc.h" -#include "private/md5.h" -#include "private/memory.h" -#include "private/macros.h" +#include "../compat.h" +#include "../assert.h" +#include "../stream_decoder.h" +#include "include/protected/stream_encoder.h" +#include "include/private/bitwriter.h" +#include "include/private/bitmath.h" +#include "include/private/crc.h" +#include "include/private/cpu.h" +#include "include/private/fixed.h" +#include "include/private/format.h" +#include "include/private/lpc.h" +#include "include/private/md5.h" +#include "include/private/memory.h" + #if FLAC__HAS_OGG -#include "private/ogg_helper.h" -#include "private/ogg_mapping.h" +#include "include/private/ogg_helper.h" +#include "include/private/ogg_mapping.h" #endif -#include "private/stream_encoder.h" -#include "private/stream_encoder_framing.h" -#include "private/window.h" -#include "share/alloc.h" -#include "share/private.h" +#include "include/private/stream_encoder.h" +#include "include/private/stream_encoder_framing.h" +#include "include/private/window.h" +#include "../alloc.h" +#include "../private.h" /* Exact Rice codeword length calculation is off by default. The simple diff --git a/modules/juce_audio_formats/codecs/flac_143/libFLAC/stream_encoder_framing.c b/modules/juce_audio_formats/codecs/flac_143/libFLAC/stream_encoder_framing.c index 8255b1a034..aa424b0ded 100644 --- a/modules/juce_audio_formats/codecs/flac_143/libFLAC/stream_encoder_framing.c +++ b/modules/juce_audio_formats/codecs/flac_143/libFLAC/stream_encoder_framing.c @@ -36,10 +36,10 @@ #include #include /* for strlen() */ -#include "private/stream_encoder_framing.h" -#include "private/crc.h" -#include "FLAC/assert.h" -#include "share/compat.h" +#include "include/private/stream_encoder_framing.h" +#include "include/private/crc.h" +#include "../assert.h" +#include "../compat.h" static FLAC__bool add_entropy_coding_method_(FLAC__BitWriter *bw, const FLAC__EntropyCodingMethod *method); static FLAC__bool add_residual_partitioned_rice_(FLAC__BitWriter *bw, const FLAC__int32 residual[], const uint32_t residual_samples, const uint32_t predictor_order, const uint32_t rice_parameters[], const uint32_t raw_bits[], const uint32_t partition_order, const FLAC__bool is_extended); diff --git a/modules/juce_audio_formats/codecs/flac_143/libFLAC/window.c b/modules/juce_audio_formats/codecs/flac_143/libFLAC/window.c index 6f14efa7df..79e2e2ca0c 100644 --- a/modules/juce_audio_formats/codecs/flac_143/libFLAC/window.c +++ b/modules/juce_audio_formats/codecs/flac_143/libFLAC/window.c @@ -35,10 +35,10 @@ #endif #include -#include "share/compat.h" -#include "FLAC/assert.h" -#include "FLAC/format.h" -#include "private/window.h" +#include "../compat.h" +#include "../assert.h" +#include "../format.h" +#include "include/private/window.h" #ifndef FLAC__INTEGER_ONLY_LIBRARY