mirrors/flac
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tweak the FLAC__INLINE macro to FLaC__INLINE to avoid conflict with autoconf

Browse Source
This commit is contained in:
Josh Coalson 2001-07-20 23:44:35 +00:00
parent 17098a04aa
commit 9bab041a95
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/exe.mk
View File

@ -33,7 +33,7 @@ all : release
include ../../build/config.mk include ../../build/config.mk
debug : CFLAGS = -g -O0 -DDEBUG $(DEBUG_CFLAGS) -Wall -W -DVERSION=$(VERSION) $(DEFINES) $(INCLUDES) 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) LFLAGS = -L$(LIBPATH)

2
build/lib.mk
View File

@ -32,7 +32,7 @@ all : release
include ../../build/config.mk include ../../build/config.mk
debug : CFLAGS = -g -O0 -DDEBUG $(DEBUG_CFLAGS) -Wall -W -DVERSION=$(VERSION) $(DEFINES) $(INCLUDES) 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) LFLAGS = -L$(LIBPATH)

2
configure.in
View File

@ -142,7 +142,7 @@ if test x$debug = xtrue; then
else else
CFLAGS="$CFLAGS -O3 -DNDEBUG" CFLAGS="$CFLAGS -O3 -DNDEBUG"
if test x$GCC = xyes; then 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
fi fi
CFLAGS="$CFLAGS $SAVE_CFLAGS" CFLAGS="$CFLAGS $SAVE_CFLAGS"

10
src/libFLAC/bitbuffer.c
View File

@ -46,8 +46,8 @@ static const unsigned FLAC__BITBUFFER_DEFAULT_CAPACITY = 65536; /* bytes */
#endif #endif
#define max(x,y) ((x)>(y)?(x):(y)) #define max(x,y) ((x)>(y)?(x):(y))
#ifndef FLAC__INLINE #ifndef FLaC__INLINE
#define FLAC__INLINE #define FLaC__INLINE
#endif #endif
static FLAC__bool bitbuffer_resize_(FLAC__BitBuffer *bb, unsigned new_capacity) 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; 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; 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 #ifdef FLAC__NO_MANUAL_INLINING
{ {
unsigned i; unsigned i;
@ -1394,7 +1394,7 @@ FLAC__bool FLAC__bitbuffer_read_raw_int64(FLAC__BitBuffer *bb, FLAC__int64 *val,
} }
#endif #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 #ifdef FLAC__NO_MANUAL_INLINING
{ {
unsigned bit, val_ = 0; unsigned bit, val_ = 0;

8
src/libFLAC/md5.c
View File

@ -28,8 +28,8 @@
#include "private/md5.h" #include "private/md5.h"
#ifndef FLAC__INLINE #ifndef FLaC__INLINE
#define FLAC__INLINE #define FLaC__INLINE
#endif #endif
static FLAC__bool is_big_endian_host_; 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 * reflect the addition of 16 longwords of new data. MD5Update blocks
* the data and converts bytes into longwords for this routine. * the data and converts bytes into longwords for this routine.
*/ */
FLAC__INLINE FLaC__INLINE
void void
MD5Transform(FLAC__uint32 buf[4], FLAC__uint32 const in[16]) 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 #endif
FLAC__INLINE FLaC__INLINE
void void
byteSwap(FLAC__uint32 *buf, unsigned words) byteSwap(FLAC__uint32 *buf, unsigned words)
{ {