unify inlining method in prep for inline tests

This commit is contained in:
Josh Coalson
2007-03-12 05:08:21 +00:00
parent 10a6840138
commit 14b184cced
5 changed files with 28 additions and 20 deletions

View File

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