[MPlayer-cvslog] CVS: main mp_msg.c,1.27,1.28 mp_msg.h,1.33,1.34

[Torinthiel]

On Thu, Sep 29, 2005 at 07:21:14AM +0200, Oded Shimon CVS wrote:
> RCS file: /cvsroot/mplayer/main/mp_msg.h,v
> retrieving revision 1.33
> retrieving revision 1.34
> diff -u -r1.33 -r1.34
> --- mp_msg.h	20 Jan 2005 13:22:52 -0000	1.33
> +++ mp_msg.h	29 Sep 2005 05:21:12 -0000	1.34
> @@ -114,26 +114,17 @@
>  #endif
>  
>  #ifdef __GNUC__
> -void mp_msg_c( int x, const char *format, ... ) __attribute__ ((format (printf, 2, 3)));
> -#define mp_msg(mod,lev, args... ) mp_msg_c(((mod)<<8)|(lev), ## args )
> -
> -#ifdef MP_DEBUG
> -#define mp_dbg(mod,lev, args... ) mp_msg_c(((mod)<<8)|(lev), ## args )
> -#else
> -// these messages are only usefull for developers, disable them
> -#define mp_dbg(mod,lev, args... ) 
> -#endif
> +void mp_msg(int mod, int lev, const char *format, ... ) __attribute__ ((format (printf, 3, 4)));
>  #else // not GNU C
> -void mp_msg_c( int x, const char *format, ... );
> -#define mp_msg(mod,lev, ... ) mp_msg_c(((mod)<<8)|(lev), __VA_ARGS__)
> +void mp_msg(int mod, int lev, const char *format, ... );
> +#endif
>  
>  #ifdef MP_DEBUG
> -#define mp_dbg(mod,lev, ... ) mp_msg_c(((mod)<<8)|(lev), __VA_ARGS__)
> +#define mp_dbg(mod,lev, ... ) mp_msg(mod, lev, __VA_ARGS__)
>  #else
>  // these messages are only usefull for developers, disable them
>  #define mp_dbg(mod,lev, ... ) 
>  #endif
> -#endif

kraken:~/mplayer/main$ make
make -C libmpdemux
make[1]: Entering directory `/home/torinthiel/mplayer/main/libmpdemux'
cc -c -I../libvo -I../../libvo -I/usr/X11R6/include -fno-PIC -g -O4 -march=i686 -mcpu=i686 -pipe -ffast-math -fomit-frame-pointer -D_REENTRANT -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64  -I.. -I../loader    -I../libavutil -I../libavcodec -I../libavformat    -I/usr/lib/live/liveMedia/include -I/usr/lib/live/UsageEnvironment/include -I/usr/lib/live/BasicUsageEnvironment/include -I/usr/lib/live/groupsock/include -o demux_rtp.o demux_rtp.cpp
In file included from mp_msg.h:2,
                 from stream.h:4,
                 from demux_rtp.h:8,
                 from demux_rtp.cpp:9:
../mp_msg.h:126: badly punctuated parameter list in `#define'

gcc 2.95
Torinthiel

-- 
 Waclaw "Torinthiel" Schiller       GG#: 542916, 3073512
   torinthiel(at)megapolis(dot)pl
   gpg: 0906A2CE fpr: EE3E DFB4 C4D6 E22E 8999  D714 7CEB CDDC 0906 A2CE
 "No classmates may be used during this examination"
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
URL: <http://lists.mplayerhq.hu/pipermail/mplayer-cvslog/attachments/20050930/82de6694/attachment.pgp>