diff options
| author | Josh Coalson <jcoalson@users.sourceforce.net> | 2001-07-20 23:44:35 +0000 |
|---|---|---|
| committer | Josh Coalson <jcoalson@users.sourceforce.net> | 2001-07-20 23:44:35 +0000 |
| commit | 9bab041a950acccebe1e8bcb4007943e676aa7d0 (patch) | |
| tree | 60cd129a6858b2f844d6df733f9586285dde1ace /src | |
| parent | 17098a04aa35fe822970f51866e32e862a7abbc1 (diff) | |
| download | flac-9bab041a950acccebe1e8bcb4007943e676aa7d0.tar.gz | |
tweak the FLAC__INLINE macro to FLaC__INLINE to avoid conflict with autoconf
Diffstat (limited to 'src')
| -rw-r--r-- | src/libFLAC/bitbuffer.c | 10 | ||||
| -rw-r--r-- | src/libFLAC/md5.c | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/libFLAC/bitbuffer.c b/src/libFLAC/bitbuffer.c index adb31f70..187fdfad 100644 --- a/src/libFLAC/bitbuffer.c +++ b/src/libFLAC/bitbuffer.c @@ -46,8 +46,8 @@ static const unsigned FLAC__BITBUFFER_DEFAULT_CAPACITY = 65536; /* bytes */ #endif #define max(x,y) ((x)>(y)?(x):(y)) -#ifndef FLAC__INLINE -#define FLAC__INLINE +#ifndef FLaC__INLINE +#define FLaC__INLINE #endif static FLAC__bool bitbuffer_resize_(FLAC__BitBuffer *bb, unsigned new_capacity) @@ -272,7 +272,7 @@ FLAC__bool FLAC__bitbuffer_write_zeroes(FLAC__BitBuffer *bb, unsigned bits) return true; } -FLAC__INLINE FLAC__bool FLAC__bitbuffer_write_raw_uint32(FLAC__BitBuffer *bb, FLAC__uint32 val, unsigned bits) +FLaC__INLINE FLAC__bool FLAC__bitbuffer_write_raw_uint32(FLAC__BitBuffer *bb, FLAC__uint32 val, unsigned bits) { unsigned n, k; @@ -1053,7 +1053,7 @@ FLAC__bool FLAC__bitbuffer_read_bit_to_uint64(FLAC__BitBuffer *bb, FLAC__uint64 } } -FLAC__INLINE FLAC__bool FLAC__bitbuffer_read_raw_uint32(FLAC__BitBuffer *bb, FLAC__uint32 *val, const unsigned bits, FLAC__bool (*read_callback)(FLAC__byte buffer[], unsigned *bytes, void *client_data), void *client_data) +FLaC__INLINE FLAC__bool FLAC__bitbuffer_read_raw_uint32(FLAC__BitBuffer *bb, FLAC__uint32 *val, const unsigned bits, FLAC__bool (*read_callback)(FLAC__byte buffer[], unsigned *bytes, void *client_data), void *client_data) #ifdef FLAC__NO_MANUAL_INLINING { unsigned i; @@ -1394,7 +1394,7 @@ FLAC__bool FLAC__bitbuffer_read_raw_int64(FLAC__BitBuffer *bb, FLAC__int64 *val, } #endif -FLAC__INLINE FLAC__bool FLAC__bitbuffer_read_unary_unsigned(FLAC__BitBuffer *bb, unsigned *val, FLAC__bool (*read_callback)(FLAC__byte buffer[], unsigned *bytes, void *client_data), void *client_data) +FLaC__INLINE FLAC__bool FLAC__bitbuffer_read_unary_unsigned(FLAC__BitBuffer *bb, unsigned *val, FLAC__bool (*read_callback)(FLAC__byte buffer[], unsigned *bytes, void *client_data), void *client_data) #ifdef FLAC__NO_MANUAL_INLINING { unsigned bit, val_ = 0; diff --git a/src/libFLAC/md5.c b/src/libFLAC/md5.c index 53c326a9..b67efba8 100644 --- a/src/libFLAC/md5.c +++ b/src/libFLAC/md5.c @@ -28,8 +28,8 @@ #include "private/md5.h" -#ifndef FLAC__INLINE -#define FLAC__INLINE +#ifndef FLaC__INLINE +#define FLaC__INLINE #endif static FLAC__bool is_big_endian_host_; @@ -53,7 +53,7 @@ static FLAC__bool is_big_endian_host_; * reflect the addition of 16 longwords of new data. MD5Update blocks * the data and converts bytes into longwords for this routine. */ -FLAC__INLINE +FLaC__INLINE void MD5Transform(FLAC__uint32 buf[4], FLAC__uint32 const in[16]) { @@ -140,7 +140,7 @@ MD5Transform(FLAC__uint32 buf[4], FLAC__uint32 const in[16]) #endif -FLAC__INLINE +FLaC__INLINE void byteSwap(FLAC__uint32 *buf, unsigned words) { |