Bug#416855: Fwd: [Pkg-mythtv-maintainers] Bug#416855: FTBFS with GCC 4.3: the meaning of "inline" changed in C99

[Martin Michlmayr]

Here's a patch that's really complete.  Seems I forgot some functions
yesterday.

--- libtwolame/common.h~	2007-03-31 09:25:45.000000000 +0000
+++ libtwolame/common.h	2007-03-31 09:25:56.000000000 +0000
@@ -39,7 +39,7 @@
 /* Same problem under Mac OS X */
 #  define NO_DLL_INLINE
 # else
-#  define NO_DLL_INLINE inline
+#  define NO_DLL_INLINE extern inline
 # endif
 #endif
 
--- libtwolame/bitbuffer.c~	2007-03-31 09:26:07.000000000 +0000
+++ libtwolame/bitbuffer.c	2007-03-31 09:26:19.000000000 +0000
@@ -59,7 +59,7 @@
 
 
 /*write 1 bit from the bit stream */
-NO_DLL_INLINE void buffer_put1bit (bit_stream * bs, int bit)
+void buffer_put1bit (bit_stream * bs, int bit)
 {
 	bs->totbit++;
 	
@@ -78,7 +78,7 @@
 }
 
 /*write N bits into the bit stream */
-NO_DLL_INLINE void buffer_putbits (bit_stream * bs, unsigned int val, int N)
+void buffer_putbits (bit_stream * bs, unsigned int val, int N)
 {
 	static const int putmask[9] = { 0x0, 0x1, 0x3, 0x7, 0xf, 0x1f, 0x3f, 0x7f, 0xff };
 	register int j = N;
@@ -105,7 +105,7 @@
 }
 
 /*return the current bit stream length (in bits)*/
-NO_DLL_INLINE unsigned long buffer_sstell (bit_stream * bs)
+unsigned long buffer_sstell (bit_stream * bs)
 {
 	return (bs->totbit);
 }

-- 
Martin Michlmayr
http://www.cyrius.com/