From 19e56122a9967a7461dbcf0890f468d5c514cf6d Mon Sep 17 00:00:00 2001 From: Chris Moeller Date: Sun, 2 Aug 2015 00:17:47 -0700 Subject: [PATCH] Fixed FLAC assert.h issue --- .../include/FLAC/{assert.h => FLAC_assert.h} | 2 +- Frameworks/FLAC/flac-1.2.1/include/FLAC/all.h | 2 +- Frameworks/FLAC/flac-1.2.1/src/libFLAC/bitmath.c | 2 +- Frameworks/FLAC/flac-1.2.1/src/libFLAC/bitreader.c | 2 +- Frameworks/FLAC/flac-1.2.1/src/libFLAC/bitwriter.c | 2 +- Frameworks/FLAC/flac-1.2.1/src/libFLAC/fixed.c | 2 +- Frameworks/FLAC/flac-1.2.1/src/libFLAC/float.c | 2 +- Frameworks/FLAC/flac-1.2.1/src/libFLAC/format.c | 2 +- Frameworks/FLAC/flac-1.2.1/src/libFLAC/lpc.c | 2 +- Frameworks/FLAC/flac-1.2.1/src/libFLAC/memory.c | 2 +- .../FLAC/flac-1.2.1/src/libFLAC/metadata_iterators.c | 2 +- .../FLAC/flac-1.2.1/src/libFLAC/metadata_object.c | 2 +- .../FLAC/flac-1.2.1/src/libFLAC/ogg_decoder_aspect.c | 2 +- .../FLAC/flac-1.2.1/src/libFLAC/ogg_encoder_aspect.c | 2 +- Frameworks/FLAC/flac-1.2.1/src/libFLAC/ogg_helper.c | 2 +- .../FLAC/flac-1.2.1/src/libFLAC/stream_decoder.c | 2 +- .../FLAC/flac-1.2.1/src/libFLAC/stream_encoder.c | 2 +- .../flac-1.2.1/src/libFLAC/stream_encoder_framing.c | 2 +- Frameworks/FLAC/flac-1.2.1/src/libFLAC/window.c | 2 +- Frameworks/FLAC/flac.xcodeproj/project.pbxproj | 10 ++++------ 20 files changed, 23 insertions(+), 25 deletions(-) rename Frameworks/FLAC/flac-1.2.1/include/FLAC/{assert.h => FLAC_assert.h} (93%) diff --git a/Frameworks/FLAC/flac-1.2.1/include/FLAC/assert.h b/Frameworks/FLAC/flac-1.2.1/include/FLAC/FLAC_assert.h similarity index 93% rename from Frameworks/FLAC/flac-1.2.1/include/FLAC/assert.h rename to Frameworks/FLAC/flac-1.2.1/include/FLAC/FLAC_assert.h index bd17ad0fe..3fc03f316 100644 --- a/Frameworks/FLAC/flac-1.2.1/include/FLAC/assert.h +++ b/Frameworks/FLAC/flac-1.2.1/include/FLAC/FLAC_assert.h @@ -34,7 +34,7 @@ /* we need this since some compilers (like MSVC) leave assert()s on release code (and we don't want to use their ASSERT) */ #ifdef DEBUG -#include +#include #define FLAC__ASSERT(x) assert(x) #define FLAC__ASSERT_DECLARATION(x) x #else diff --git a/Frameworks/FLAC/flac-1.2.1/include/FLAC/all.h b/Frameworks/FLAC/flac-1.2.1/include/FLAC/all.h index c542c0d5d..9765d5a02 100644 --- a/Frameworks/FLAC/flac-1.2.1/include/FLAC/all.h +++ b/Frameworks/FLAC/flac-1.2.1/include/FLAC/all.h @@ -34,7 +34,7 @@ #include "export.h" -#include "assert.h" +#include "FLAC_assert.h" #include "callback.h" #include "format.h" #include "metadata.h" diff --git a/Frameworks/FLAC/flac-1.2.1/src/libFLAC/bitmath.c b/Frameworks/FLAC/flac-1.2.1/src/libFLAC/bitmath.c index 27e25f0f7..c6e761272 100644 --- a/Frameworks/FLAC/flac-1.2.1/src/libFLAC/bitmath.c +++ b/Frameworks/FLAC/flac-1.2.1/src/libFLAC/bitmath.c @@ -34,7 +34,7 @@ #endif #include "private/bitmath.h" -#include "FLAC/assert.h" +#include "FLAC/FLAC_assert.h" /* An example of what FLAC__bitmath_ilog2() computes: * diff --git a/Frameworks/FLAC/flac-1.2.1/src/libFLAC/bitreader.c b/Frameworks/FLAC/flac-1.2.1/src/libFLAC/bitreader.c index 7d63e526e..4b936dd14 100644 --- a/Frameworks/FLAC/flac-1.2.1/src/libFLAC/bitreader.c +++ b/Frameworks/FLAC/flac-1.2.1/src/libFLAC/bitreader.c @@ -47,7 +47,7 @@ #include "private/bitmath.h" #include "private/bitreader.h" #include "private/crc.h" -#include "FLAC/assert.h" +#include "FLAC/FLAC_assert.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_MSBS below to match */ diff --git a/Frameworks/FLAC/flac-1.2.1/src/libFLAC/bitwriter.c b/Frameworks/FLAC/flac-1.2.1/src/libFLAC/bitwriter.c index e3e7ad164..d33e18f80 100755 --- a/Frameworks/FLAC/flac-1.2.1/src/libFLAC/bitwriter.c +++ b/Frameworks/FLAC/flac-1.2.1/src/libFLAC/bitwriter.c @@ -49,7 +49,7 @@ #endif #include "private/bitwriter.h" #include "private/crc.h" -#include "FLAC/assert.h" +#include "FLAC/FLAC_assert.h" #include "share/alloc.h" /* Things should be fastest when this matches the machine word size */ diff --git a/Frameworks/FLAC/flac-1.2.1/src/libFLAC/fixed.c b/Frameworks/FLAC/flac-1.2.1/src/libFLAC/fixed.c index 1a3aac090..4242d01ba 100644 --- a/Frameworks/FLAC/flac-1.2.1/src/libFLAC/fixed.c +++ b/Frameworks/FLAC/flac-1.2.1/src/libFLAC/fixed.c @@ -37,7 +37,7 @@ #include #include "private/bitmath.h" #include "private/fixed.h" -#include "FLAC/assert.h" +#include "FLAC/FLAC_assert.h" #ifndef M_LN2 /* math.h in VC++ doesn't seem to have this (how Microsoft is that?) */ diff --git a/Frameworks/FLAC/flac-1.2.1/src/libFLAC/float.c b/Frameworks/FLAC/flac-1.2.1/src/libFLAC/float.c index 8e1928020..76a7be706 100644 --- a/Frameworks/FLAC/flac-1.2.1/src/libFLAC/float.c +++ b/Frameworks/FLAC/flac-1.2.1/src/libFLAC/float.c @@ -33,7 +33,7 @@ # include #endif -#include "FLAC/assert.h" +#include "FLAC/FLAC_assert.h" #include "private/float.h" diff --git a/Frameworks/FLAC/flac-1.2.1/src/libFLAC/format.c b/Frameworks/FLAC/flac-1.2.1/src/libFLAC/format.c index 749461d86..d8f551317 100644 --- a/Frameworks/FLAC/flac-1.2.1/src/libFLAC/format.c +++ b/Frameworks/FLAC/flac-1.2.1/src/libFLAC/format.c @@ -36,7 +36,7 @@ #include #include /* for qsort() */ #include /* for memset() */ -#include "FLAC/assert.h" +#include "FLAC/FLAC_assert.h" #include "FLAC/format.h" #include "private/format.h" diff --git a/Frameworks/FLAC/flac-1.2.1/src/libFLAC/lpc.c b/Frameworks/FLAC/flac-1.2.1/src/libFLAC/lpc.c index 7806348f2..53c02b2fa 100644 --- a/Frameworks/FLAC/flac-1.2.1/src/libFLAC/lpc.c +++ b/Frameworks/FLAC/flac-1.2.1/src/libFLAC/lpc.c @@ -34,7 +34,7 @@ #endif #include -#include "FLAC/assert.h" +#include "FLAC/FLAC_assert.h" #include "FLAC/format.h" #include "private/bitmath.h" #include "private/lpc.h" diff --git a/Frameworks/FLAC/flac-1.2.1/src/libFLAC/memory.c b/Frameworks/FLAC/flac-1.2.1/src/libFLAC/memory.c index 4d1009750..fc4617568 100644 --- a/Frameworks/FLAC/flac-1.2.1/src/libFLAC/memory.c +++ b/Frameworks/FLAC/flac-1.2.1/src/libFLAC/memory.c @@ -34,7 +34,7 @@ #endif #include "private/memory.h" -#include "FLAC/assert.h" +#include "FLAC/FLAC_assert.h" #include "share/alloc.h" void *FLAC__memory_alloc_aligned(size_t bytes, void **aligned_address) diff --git a/Frameworks/FLAC/flac-1.2.1/src/libFLAC/metadata_iterators.c b/Frameworks/FLAC/flac-1.2.1/src/libFLAC/metadata_iterators.c index 15362f7b5..ff083df0d 100644 --- a/Frameworks/FLAC/flac-1.2.1/src/libFLAC/metadata_iterators.c +++ b/Frameworks/FLAC/flac-1.2.1/src/libFLAC/metadata_iterators.c @@ -59,7 +59,7 @@ #include "private/metadata.h" -#include "FLAC/assert.h" +#include "FLAC/FLAC_assert.h" #include "FLAC/stream_decoder.h" #include "share/alloc.h" diff --git a/Frameworks/FLAC/flac-1.2.1/src/libFLAC/metadata_object.c b/Frameworks/FLAC/flac-1.2.1/src/libFLAC/metadata_object.c index ada5a64fb..dc49da70c 100644 --- a/Frameworks/FLAC/flac-1.2.1/src/libFLAC/metadata_object.c +++ b/Frameworks/FLAC/flac-1.2.1/src/libFLAC/metadata_object.c @@ -38,7 +38,7 @@ #include "private/metadata.h" -#include "FLAC/assert.h" +#include "FLAC/FLAC_assert.h" #include "share/alloc.h" diff --git a/Frameworks/FLAC/flac-1.2.1/src/libFLAC/ogg_decoder_aspect.c b/Frameworks/FLAC/flac-1.2.1/src/libFLAC/ogg_decoder_aspect.c index 6974de306..392b92eda 100644 --- a/Frameworks/FLAC/flac-1.2.1/src/libFLAC/ogg_decoder_aspect.c +++ b/Frameworks/FLAC/flac-1.2.1/src/libFLAC/ogg_decoder_aspect.c @@ -34,7 +34,7 @@ #endif #include /* for memcpy() */ -#include "FLAC/assert.h" +#include "FLAC/FLAC_assert.h" #include "private/ogg_decoder_aspect.h" #include "private/ogg_mapping.h" diff --git a/Frameworks/FLAC/flac-1.2.1/src/libFLAC/ogg_encoder_aspect.c b/Frameworks/FLAC/flac-1.2.1/src/libFLAC/ogg_encoder_aspect.c index 37df08935..2ee1c4c88 100644 --- a/Frameworks/FLAC/flac-1.2.1/src/libFLAC/ogg_encoder_aspect.c +++ b/Frameworks/FLAC/flac-1.2.1/src/libFLAC/ogg_encoder_aspect.c @@ -34,7 +34,7 @@ #endif #include /* for memset() */ -#include "FLAC/assert.h" +#include "FLAC/FLAC_assert.h" #include "private/ogg_encoder_aspect.h" #include "private/ogg_mapping.h" diff --git a/Frameworks/FLAC/flac-1.2.1/src/libFLAC/ogg_helper.c b/Frameworks/FLAC/flac-1.2.1/src/libFLAC/ogg_helper.c index 73f9f0bee..11c7eec9a 100644 --- a/Frameworks/FLAC/flac-1.2.1/src/libFLAC/ogg_helper.c +++ b/Frameworks/FLAC/flac-1.2.1/src/libFLAC/ogg_helper.c @@ -35,7 +35,7 @@ #include /* for malloc() */ #include /* for memcmp(), memcpy() */ -#include "FLAC/assert.h" +#include "FLAC/FLAC_assert.h" #include "share/alloc.h" #include "private/ogg_helper.h" #include "protected/stream_encoder.h" diff --git a/Frameworks/FLAC/flac-1.2.1/src/libFLAC/stream_decoder.c b/Frameworks/FLAC/flac-1.2.1/src/libFLAC/stream_decoder.c index e44877661..edb04cdaa 100644 --- a/Frameworks/FLAC/flac-1.2.1/src/libFLAC/stream_decoder.c +++ b/Frameworks/FLAC/flac-1.2.1/src/libFLAC/stream_decoder.c @@ -52,7 +52,7 @@ #define ftello ftell #endif #endif -#include "FLAC/assert.h" +#include "FLAC/FLAC_assert.h" #include "FLAC/format.h" #include "share/alloc.h" #include "protected/stream_decoder.h" diff --git a/Frameworks/FLAC/flac-1.2.1/src/libFLAC/stream_encoder.c b/Frameworks/FLAC/flac-1.2.1/src/libFLAC/stream_encoder.c index 6d9859c9e..e1dd55038 100644 --- a/Frameworks/FLAC/flac-1.2.1/src/libFLAC/stream_encoder.c +++ b/Frameworks/FLAC/flac-1.2.1/src/libFLAC/stream_encoder.c @@ -52,7 +52,7 @@ #define ftello ftell #endif #endif -#include "FLAC/assert.h" +#include "FLAC/FLAC_assert.h" #include "FLAC/stream_decoder.h" #include "share/alloc.h" #include "protected/stream_encoder.h" diff --git a/Frameworks/FLAC/flac-1.2.1/src/libFLAC/stream_encoder_framing.c b/Frameworks/FLAC/flac-1.2.1/src/libFLAC/stream_encoder_framing.c index 939955bf2..3c7c1dea1 100644 --- a/Frameworks/FLAC/flac-1.2.1/src/libFLAC/stream_encoder_framing.c +++ b/Frameworks/FLAC/flac-1.2.1/src/libFLAC/stream_encoder_framing.c @@ -37,7 +37,7 @@ #include /* for strlen() */ #include "private/stream_encoder_framing.h" #include "private/crc.h" -#include "FLAC/assert.h" +#include "FLAC/FLAC_assert.h" #ifdef max #undef max diff --git a/Frameworks/FLAC/flac-1.2.1/src/libFLAC/window.c b/Frameworks/FLAC/flac-1.2.1/src/libFLAC/window.c index cd689c573..67487d5d0 100644 --- a/Frameworks/FLAC/flac-1.2.1/src/libFLAC/window.c +++ b/Frameworks/FLAC/flac-1.2.1/src/libFLAC/window.c @@ -34,7 +34,7 @@ #endif #include -#include "FLAC/assert.h" +#include "FLAC/FLAC_assert.h" #include "FLAC/format.h" #include "private/window.h" diff --git a/Frameworks/FLAC/flac.xcodeproj/project.pbxproj b/Frameworks/FLAC/flac.xcodeproj/project.pbxproj index 0930e642c..c6b0a99b1 100644 --- a/Frameworks/FLAC/flac.xcodeproj/project.pbxproj +++ b/Frameworks/FLAC/flac.xcodeproj/project.pbxproj @@ -8,7 +8,7 @@ /* Begin PBXBuildFile section */ 17B5E1980CC074D3004E2AF4 /* all.h in Headers */ = {isa = PBXBuildFile; fileRef = 17B5E1460CC074D3004E2AF4 /* all.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 17B5E1990CC074D3004E2AF4 /* assert.h in Headers */ = {isa = PBXBuildFile; fileRef = 17B5E1470CC074D3004E2AF4 /* assert.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 17B5E1990CC074D3004E2AF4 /* FLAC_assert.h in Headers */ = {isa = PBXBuildFile; fileRef = 17B5E1470CC074D3004E2AF4 /* FLAC_assert.h */; settings = {ATTRIBUTES = (Public, ); }; }; 17B5E19A0CC074D3004E2AF4 /* callback.h in Headers */ = {isa = PBXBuildFile; fileRef = 17B5E1480CC074D3004E2AF4 /* callback.h */; settings = {ATTRIBUTES = (Public, ); }; }; 17B5E19B0CC074D3004E2AF4 /* export.h in Headers */ = {isa = PBXBuildFile; fileRef = 17B5E1490CC074D3004E2AF4 /* export.h */; settings = {ATTRIBUTES = (Public, ); }; }; 17B5E19C0CC074D3004E2AF4 /* format.h in Headers */ = {isa = PBXBuildFile; fileRef = 17B5E14A0CC074D3004E2AF4 /* format.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -73,7 +73,7 @@ 0867D6A5FE840307C02AAC07 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = ""; }; 1058C7B1FEA5585E11CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = ""; }; 17B5E1460CC074D3004E2AF4 /* all.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = all.h; sourceTree = ""; }; - 17B5E1470CC074D3004E2AF4 /* assert.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = assert.h; sourceTree = ""; }; + 17B5E1470CC074D3004E2AF4 /* FLAC_assert.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = FLAC_assert.h; sourceTree = ""; }; 17B5E1480CC074D3004E2AF4 /* callback.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = callback.h; sourceTree = ""; }; 17B5E1490CC074D3004E2AF4 /* export.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = export.h; sourceTree = ""; }; 17B5E14A0CC074D3004E2AF4 /* format.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = format.h; sourceTree = ""; }; @@ -220,7 +220,7 @@ isa = PBXGroup; children = ( 17B5E1460CC074D3004E2AF4 /* all.h */, - 17B5E1470CC074D3004E2AF4 /* assert.h */, + 17B5E1470CC074D3004E2AF4 /* FLAC_assert.h */, 17B5E1480CC074D3004E2AF4 /* callback.h */, 17B5E1490CC074D3004E2AF4 /* export.h */, 17B5E14A0CC074D3004E2AF4 /* format.h */, @@ -349,7 +349,7 @@ buildActionMask = 2147483647; files = ( 17B5E1980CC074D3004E2AF4 /* all.h in Headers */, - 17B5E1990CC074D3004E2AF4 /* assert.h in Headers */, + 17B5E1990CC074D3004E2AF4 /* FLAC_assert.h in Headers */, 17B5E19A0CC074D3004E2AF4 /* callback.h in Headers */, 17B5E19B0CC074D3004E2AF4 /* export.h in Headers */, 17B5E19C0CC074D3004E2AF4 /* format.h in Headers */, @@ -559,7 +559,6 @@ 1DEB91B208733DA50010E9CD /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; GCC_PREPROCESSOR_DEFINITIONS = "DEBUG=1"; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; @@ -575,7 +574,6 @@ 1DEB91B308733DA50010E9CD /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES;