From 9bab041a950acccebe1e8bcb4007943e676aa7d0 Mon Sep 17 00:00:00 2001 From: Josh Coalson Date: Fri, 20 Jul 2001 23:44:35 +0000 Subject: [PATCH] tweak the FLAC__INLINE macro to FLaC__INLINE to avoid conflict with autoconf --- build/exe.mk | 2 +- build/lib.mk | 2 +- configure.in | 2 +- src/libFLAC/bitbuffer.c | 10 +++++----- src/libFLAC/md5.c | 8 ++++---- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/build/exe.mk b/build/exe.mk index 0ea110a7..ce36e931 100644 --- a/build/exe.mk +++ b/build/exe.mk @@ -33,7 +33,7 @@ all : release include ../../build/config.mk debug : CFLAGS = -g -O0 -DDEBUG $(DEBUG_CFLAGS) -Wall -W -DVERSION=$(VERSION) $(DEFINES) $(INCLUDES) -release : CFLAGS = -O3 -fomit-frame-pointer -funroll-loops -finline-functions -DNDEBUG $(RELEASE_CFLAGS) -Wall -W -Winline -DFLAC__INLINE=__inline__ -DVERSION=$(VERSION) $(DEFINES) $(INCLUDES) +release : CFLAGS = -O3 -fomit-frame-pointer -funroll-loops -finline-functions -DNDEBUG $(RELEASE_CFLAGS) -Wall -W -Winline -DFLaC__INLINE=__inline__ -DVERSION=$(VERSION) $(DEFINES) $(INCLUDES) LFLAGS = -L$(LIBPATH) diff --git a/build/lib.mk b/build/lib.mk index 1a32af16..bc9ecfb1 100644 --- a/build/lib.mk +++ b/build/lib.mk @@ -32,7 +32,7 @@ all : release include ../../build/config.mk debug : CFLAGS = -g -O0 -DDEBUG $(DEBUG_CFLAGS) -Wall -W -DVERSION=$(VERSION) $(DEFINES) $(INCLUDES) -release : CFLAGS = -O3 -fomit-frame-pointer -funroll-loops -finline-functions -DNDEBUG $(RELEASE_CFLAGS) -Wall -W -Winline -DFLAC__INLINE=__inline__ -DVERSION=$(VERSION) $(DEFINES) $(INCLUDES) +release : CFLAGS = -O3 -fomit-frame-pointer -funroll-loops -finline-functions -DNDEBUG $(RELEASE_CFLAGS) -Wall -W -Winline -DFLaC__INLINE=__inline__ -DVERSION=$(VERSION) $(DEFINES) $(INCLUDES) LFLAGS = -L$(LIBPATH) diff --git a/configure.in b/configure.in index a0ea301b..63199fa7 100644 --- a/configure.in +++ b/configure.in @@ -142,7 +142,7 @@ if test x$debug = xtrue; then else CFLAGS="$CFLAGS -O3 -DNDEBUG" if test x$GCC = xyes; then - CFLAGS="$CFLAGS -fomit-frame-pointer -funroll-loops -finline-functions -Winline -DFLAC__INLINE=__inline__" + CFLAGS="$CFLAGS -fomit-frame-pointer -funroll-loops -finline-functions -Winline -DFLaC__INLINE=__inline__" fi fi CFLAGS="$CFLAGS $SAVE_CFLAGS" 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) {