On Sun, Oct 18, 2009 at 04:03PM +0200, Max Kellermann wrote:
> On 2009/10/18 14:24, Serge Ziryukin <ftrvxm...@gmail.com> wrote:
> > ---
> >  src/decoder/vorbis_plugin.c |    1 +
> >  1 files changed, 1 insertions(+), 0 deletions(-)
> > 
> > diff --git a/src/decoder/vorbis_plugin.c b/src/decoder/vorbis_plugin.c
> > index 95f2de0..2ac9c3b 100755
> > --- a/src/decoder/vorbis_plugin.c
> > +++ b/src/decoder/vorbis_plugin.c
> > @@ -24,6 +24,7 @@
> >  #include "uri.h"
> >  
> >  #ifndef HAVE_TREMOR
> > +#define OV_EXCLUDE_STATIC_CALLBACKS
> >  #include <vorbis/vorbisfile.h>
> >  #else
> >  #include <tremor/ivorbisfile.h>
> 
> I don't see a warning with Debian version 1.0.2+svn14261-1.  Please
> add some more description to that patch, write which version of tremor
> is affected (paste the warning message), and where we can find
> documentation on that macro.

Compiling with libvorbis-1.2.3 installed gives me these warnings:
 gcc -std=gnu99 -DHAVE_CONFIG_H -I.  -I./src -D_REENTRANT 
-I/usr/local/include/glib-2.0 -I/usr/local/lib/glib-2.0/include  
-DSYSTEM_CONFIG_FILE_LOCATION='"/usr/local/etc/mpd.conf"'  -I/usr/local/include 
     -I/usr/local/include  -I/usr/local/include/ -I/usr/local/include/glib-2.0 
-I/usr/local/lib/glib-2.0/include    -I/usr/local/include       
-I/usr/local/include  -I/usr/local/include -D_REENTRANT  -I/usr/local/include 
-I/usr/local/include/libmodplug        -I/usr/local/include  
-I/usr/local/include  -I/usr/local/include  -I/usr/local/include 
-I/usr/local/include/ffmpeg  -I/usr/local/include/libcue-1.3    
-I/usr/local/include  -I/usr/local/include  -I/usr/local/include  
-I/usr/local/include    -I/usr/local/include  -D_REENTRANT -I/usr/local/include 
 -D_THREAD_SAFE -I/usr/local/include -I/usr/local/include/speex 
-I/usr/local/include -I/usr/local/include/ffmpeg -Wall -Wextra 
-Wno-deprecated-declarations -Wmissing-prototypes -Wdeclaration-after-statement 
-Wshadow -Wpointer-arith -Wstrict-prototypes -Wcast-qual -Wwrite-strings 
-pedantic -D_REENTRANT -D_THREAD_SAFE -I/usr/local/include 
-I/usr/local/include/glib-2.0 -I/usr/local/lib/glib-2.0/include   
-I/usr/local/include -g -O2 -I/usr/local/include -MT src_mpd-vorbis_plugin.o 
-MD -MP -MF .deps/src_mpd-vorbis_plugin.Tpo -c -o src_mpd-vorbis_plugin.o `test 
-f 'src/decoder/vorbis_plugin.c' || echo './'`src/decoder/vorbis_plugin.c
/usr/local/include/vorbis/vorbisfile.h:75: warning: 'OV_CALLBACKS_DEFAULT' 
defined but not used
/usr/local/include/vorbis/vorbisfile.h:82: warning: 'OV_CALLBACKS_NOCLOSE' 
defined but not used
/usr/local/include/vorbis/vorbisfile.h:89: warning: 'OV_CALLBACKS_STREAMONLY' 
defined but not used
/usr/local/include/vorbis/vorbisfile.h:96: warning: 
'OV_CALLBACKS_STREAMONLY_NOCLOSE' defined but not used

libtremor does not have such callbacks.

svn r13289 of libvorbis introduced static callbacks (like OV_CALLBACKS_DEFAULT)
defined in "vorbisfile.h" header. First released version with this change is 
libvorbis-1.2.2.
In libversion-1.2.3 OV_EXCLUDE_STATIC_CALLBACKS define was added to avoid
warnings about unused static callbacks. Information on the 
OV_EXCLUDE_STATIC_CALLBACKS
can be found in http://svn.xiph.org/trunk/vorbis/CHANGES.

More verbose patch attached.
From fbb42d5c39a62d9f8e428af80ac0d0907b1b685f Mon Sep 17 00:00:00 2001
From: Serge Ziryukin <ftrvxm...@gmail.com>
Date: Sun, 18 Oct 2009 18:09:32 +0300
Subject: [PATCH] decoder/vorbis: avoid unused symbol warnings from vorbisfile.h

svn r13289 of libvorbis introduced static callbacks (like OV_CALLBACKS_DEFAULT)
defined in "vorbisfile.h" header. First released version with this change is libvorbis-1.2.2.
In libversion-1.2.3 OV_EXCLUDE_STATIC_CALLBACKS define was added to avoid
warnings about unused static callbacks. Information on the OV_EXCLUDE_STATIC_CALLBACKS
can be found in http://svn.xiph.org/trunk/vorbis/CHANGES.
---
 src/decoder/vorbis_plugin.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/src/decoder/vorbis_plugin.c b/src/decoder/vorbis_plugin.c
index 95f2de0..2ac9c3b 100755
--- a/src/decoder/vorbis_plugin.c
+++ b/src/decoder/vorbis_plugin.c
@@ -24,6 +24,7 @@
 #include "uri.h"
 
 #ifndef HAVE_TREMOR
+#define OV_EXCLUDE_STATIC_CALLBACKS
 #include <vorbis/vorbisfile.h>
 #else
 #include <tremor/ivorbisfile.h>
-- 
1.6.4.3

Attachment: pgpxAyOREfX7e.pgp
Description: PGP signature

------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay 
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
Musicpd-dev-team mailing list
Musicpd-dev-team@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/musicpd-dev-team

Reply via email to