kode54
/
cog
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed FLAC assert.h issue

CQTexperiment
Chris Moeller 2015-08-02 00:17:47 -07:00
parent 3b35ff2eda
commit 19e56122a9
20 changed files with 23 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Frameworks/FLAC/flac-1.2.1/include/FLAC/assert.h → Frameworks/FLAC/flac-1.2.1/include/FLAC/FLAC_assert.h
View File

@ -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 </Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/usr/include/assert.h>
#include <assert.h>
#define FLAC__ASSERT(x) assert(x)
#define FLAC__ASSERT_DECLARATION(x) x
#else

2
Frameworks/FLAC/flac-1.2.1/include/FLAC/all.h
View File

@ -34,7 +34,7 @@
#include "export.h"
#include "assert.h"
#include "FLAC_assert.h"
#include "callback.h"
#include "format.h"
#include "metadata.h"

2
Frameworks/FLAC/flac-1.2.1/src/libFLAC/bitmath.c
View File

@ -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:
*

2
Frameworks/FLAC/flac-1.2.1/src/libFLAC/bitreader.c
View File

@ -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 */

2
Frameworks/FLAC/flac-1.2.1/src/libFLAC/bitwriter.c
View File

@ -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 */

2
Frameworks/FLAC/flac-1.2.1/src/libFLAC/fixed.c
View File

@ -37,7 +37,7 @@
#include <string.h>
#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?) */

2
Frameworks/FLAC/flac-1.2.1/src/libFLAC/float.c
View File

@ -33,7 +33,7 @@
# include <config.h>
#endif
#include "FLAC/assert.h"
#include "FLAC/FLAC_assert.h"
#include "private/float.h"

2
Frameworks/FLAC/flac-1.2.1/src/libFLAC/format.c
View File

@ -36,7 +36,7 @@
#include <stdio.h>
#include <stdlib.h> /* for qsort() */
#include <string.h> /* for memset() */
#include "FLAC/assert.h"
#include "FLAC/FLAC_assert.h"
#include "FLAC/format.h"
#include "private/format.h"

2
Frameworks/FLAC/flac-1.2.1/src/libFLAC/lpc.c
View File

@ -34,7 +34,7 @@
#endif
#include <math.h>
#include "FLAC/assert.h"
#include "FLAC/FLAC_assert.h"
#include "FLAC/format.h"
#include "private/bitmath.h"
#include "private/lpc.h"

2
Frameworks/FLAC/flac-1.2.1/src/libFLAC/memory.c
View File

@ -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)

2
Frameworks/FLAC/flac-1.2.1/src/libFLAC/metadata_iterators.c
View File

@ -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"

2
Frameworks/FLAC/flac-1.2.1/src/libFLAC/metadata_object.c
View File

@ -38,7 +38,7 @@
#include "private/metadata.h"
#include "FLAC/assert.h"
#include "FLAC/FLAC_assert.h"
#include "share/alloc.h"

2
Frameworks/FLAC/flac-1.2.1/src/libFLAC/ogg_decoder_aspect.c
View File

@ -34,7 +34,7 @@
#endif
#include <string.h> /* for memcpy() */
#include "FLAC/assert.h"
#include "FLAC/FLAC_assert.h"
#include "private/ogg_decoder_aspect.h"
#include "private/ogg_mapping.h"

2
Frameworks/FLAC/flac-1.2.1/src/libFLAC/ogg_encoder_aspect.c
View File

@ -34,7 +34,7 @@
#endif
#include <string.h> /* for memset() */
#include "FLAC/assert.h"
#include "FLAC/FLAC_assert.h"
#include "private/ogg_encoder_aspect.h"
#include "private/ogg_mapping.h"

2
Frameworks/FLAC/flac-1.2.1/src/libFLAC/ogg_helper.c
View File

@ -35,7 +35,7 @@
#include <stdlib.h> /* for malloc() */
#include <string.h> /* 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"

2
Frameworks/FLAC/flac-1.2.1/src/libFLAC/stream_decoder.c
View File

@ -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"

2
Frameworks/FLAC/flac-1.2.1/src/libFLAC/stream_encoder.c
View File

@ -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"

2
Frameworks/FLAC/flac-1.2.1/src/libFLAC/stream_encoder_framing.c
View File

@ -37,7 +37,7 @@
#include <string.h> /* 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

2
Frameworks/FLAC/flac-1.2.1/src/libFLAC/window.c
View File

@ -34,7 +34,7 @@
#endif
#include <math.h>
#include "FLAC/assert.h"
#include "FLAC/FLAC_assert.h"
#include "FLAC/format.h"
#include "private/window.h"

10
Frameworks/FLAC/flac.xcodeproj/project.pbxproj
View File

@ -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 = "<absolute>"; };
1058C7B1FEA5585E11CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
17B5E1460CC074D3004E2AF4 /* all.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = all.h; sourceTree = "<group>"; };
17B5E1470CC074D3004E2AF4 /* assert.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = assert.h; sourceTree = "<group>"; };
17B5E1470CC074D3004E2AF4 /* FLAC_assert.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = FLAC_assert.h; sourceTree = "<group>"; };
17B5E1480CC074D3004E2AF4 /* callback.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = callback.h; sourceTree = "<group>"; };
17B5E1490CC074D3004E2AF4 /* export.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = export.h; sourceTree = "<group>"; };
17B5E14A0CC074D3004E2AF4 /* format.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = format.h; sourceTree = "<group>"; };
@ -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;