diff options
-rw-r--r-- | src/libFLAC/format.c | 6 | ||||
-rw-r--r-- | src/libFLAC/stream_encoder.c | 8 | ||||
-rw-r--r-- | src/plugin_common/dither.c | 12 | ||||
-rw-r--r-- | src/plugin_common/tags.c | 14 | ||||
-rw-r--r-- | src/share/replaygain_synthesis/replaygain_synthesis.c | 8 |
5 files changed, 28 insertions, 20 deletions
diff --git a/src/libFLAC/format.c b/src/libFLAC/format.c index 3a865b41..da341ad5 100644 --- a/src/libFLAC/format.c +++ b/src/libFLAC/format.c @@ -39,6 +39,10 @@ #include "FLAC/format.h" #include "private/format.h" +#ifndef FLaC__INLINE +#define FLaC__INLINE +#endif + #ifdef min #undef min #endif @@ -294,7 +298,7 @@ FLAC_API unsigned FLAC__format_seektable_sort(FLAC__StreamMetadata_SeekTable *se * and a more clear explanation at the end of this section: * http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 */ -static __inline unsigned utf8len_(const FLAC__byte *utf8) +static FLaC__INLINE unsigned utf8len_(const FLAC__byte *utf8) { FLAC__ASSERT(0 != utf8); if ((utf8[0] & 0x80) == 0) { diff --git a/src/libFLAC/stream_encoder.c b/src/libFLAC/stream_encoder.c index cc9a9e7d..fdb0abd0 100644 --- a/src/libFLAC/stream_encoder.c +++ b/src/libFLAC/stream_encoder.c @@ -71,6 +71,10 @@ #include "private/stream_encoder_framing.h" #include "private/window.h" +#ifndef FLaC__INLINE +#define FLaC__INLINE +#endif + #ifdef min #undef min #endif @@ -4068,7 +4072,7 @@ void precompute_partition_info_escapes_( } #ifdef EXACT_RICE_BITS_CALCULATION -static __inline unsigned count_rice_bits_in_partition_( +static FLaC__INLINE unsigned count_rice_bits_in_partition_( const unsigned rice_parameter, const unsigned partition_samples, const FLAC__int32 *residual @@ -4083,7 +4087,7 @@ static __inline unsigned count_rice_bits_in_partition_( return partition_bits; } #else -static __inline unsigned count_rice_bits_in_partition_( +static FLaC__INLINE unsigned count_rice_bits_in_partition_( const unsigned rice_parameter, const unsigned partition_samples, const FLAC__uint64 abs_residual_partition_sum diff --git a/src/plugin_common/dither.c b/src/plugin_common/dither.c index 47d15c74..538a2802 100644 --- a/src/plugin_common/dither.c +++ b/src/plugin_common/dither.c @@ -32,19 +32,17 @@ #endif #define max(a,b) ((a)>(b)?(a):(b)) - -#if defined _MSC_VER -#define FLAC__INLINE __inline -#else -#define FLAC__INLINE +#ifndef FLaC__INLINE +#define FLaC__INLINE #endif + /* 32-bit pseudo-random number generator * * @@@ According to Miroslav, this one is poor quality, the one from the * @@@ original replaygain code is much better */ -static FLAC__INLINE FLAC__uint32 prng(FLAC__uint32 state) +static FLaC__INLINE FLAC__uint32 prng(FLAC__uint32 state) { return (state * 0x0019660dL + 0x3c6ef35fL) & 0xffffffffL; } @@ -56,7 +54,7 @@ typedef struct { FLAC__int32 random; } dither_state; -static FLAC__INLINE FLAC__int32 linear_dither(unsigned source_bps, unsigned target_bps, FLAC__int32 sample, dither_state *dither, const FLAC__int32 MIN, const FLAC__int32 MAX) +static FLaC__INLINE FLAC__int32 linear_dither(unsigned source_bps, unsigned target_bps, FLAC__int32 sample, dither_state *dither, const FLAC__int32 MIN, const FLAC__int32 MAX) { unsigned scalebits; FLAC__int32 output, mask, random; diff --git a/src/plugin_common/tags.c b/src/plugin_common/tags.c index 7a9ae82f..5f491d5a 100644 --- a/src/plugin_common/tags.c +++ b/src/plugin_common/tags.c @@ -28,8 +28,12 @@ #include "FLAC/assert.h" #include "FLAC/metadata.h" +#ifndef FLaC__INLINE +#define FLaC__INLINE +#endif + -static __inline unsigned local__wide_strlen(const FLAC__uint16 *s) +static FLaC__INLINE unsigned local__wide_strlen(const FLAC__uint16 *s) { unsigned n = 0; while(*s++) @@ -43,7 +47,7 @@ static __inline unsigned local__wide_strlen(const FLAC__uint16 *s) * and a more clear explanation at the end of this section: * http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 */ -static __inline unsigned local__utf8len(const FLAC__byte *utf8) +static FLaC__INLINE unsigned local__utf8len(const FLAC__byte *utf8) { FLAC__ASSERT(0 != utf8); if ((utf8[0] & 0x80) == 0) { @@ -85,7 +89,7 @@ static __inline unsigned local__utf8len(const FLAC__byte *utf8) } -static __inline unsigned local__utf8_to_ucs2(const FLAC__byte *utf8, FLAC__uint16 *ucs2) +static FLaC__INLINE unsigned local__utf8_to_ucs2(const FLAC__byte *utf8, FLAC__uint16 *ucs2) { const unsigned len = local__utf8len(utf8); @@ -140,7 +144,7 @@ static FLAC__uint16 *local__convert_utf8_to_ucs2(const char *src, unsigned lengt return out; } -static __inline unsigned local__ucs2len(FLAC__uint16 ucs2) +static FLaC__INLINE unsigned local__ucs2len(FLAC__uint16 ucs2) { if (ucs2 < 0x0080) return 1; @@ -150,7 +154,7 @@ static __inline unsigned local__ucs2len(FLAC__uint16 ucs2) return 3; } -static __inline unsigned local__ucs2_to_utf8(FLAC__uint16 ucs2, FLAC__byte *utf8) +static FLaC__INLINE unsigned local__ucs2_to_utf8(FLAC__uint16 ucs2, FLAC__byte *utf8) { if (ucs2 < 0x080) { utf8[0] = (FLAC__byte)ucs2; diff --git a/src/share/replaygain_synthesis/replaygain_synthesis.c b/src/share/replaygain_synthesis/replaygain_synthesis.c index 895791a5..e5615766 100644 --- a/src/share/replaygain_synthesis/replaygain_synthesis.c +++ b/src/share/replaygain_synthesis/replaygain_synthesis.c @@ -44,10 +44,8 @@ #include "replaygain_synthesis.h" #include "FLAC/assert.h" -#if defined _MSC_VER -#define FLAC__INLINE __inline -#else -#define FLAC__INLINE +#ifndef FLaC__INLINE +#define FLaC__INLINE #endif /* adjust for compilers that can't understand using LL suffix for int64_t literals */ @@ -238,7 +236,7 @@ void FLAC__replaygain_synthesis__init_dither_context(DitherContext *d, int bits, * the following is based on parts of wavegain.c */ -static FLAC__INLINE FLAC__int64 dither_output_(DitherContext *d, FLAC__bool do_dithering, int shapingtype, int i, double Sum, int k) +static FLaC__INLINE FLAC__int64 dither_output_(DitherContext *d, FLAC__bool do_dithering, int shapingtype, int i, double Sum, int k) { union { double d; |