[Mplayer-cvslog] CVS: main subreader.c, 1.135, 1.136 subreader.h, 1.32, 1.33

[Jan Knutar]

cc -c -I../libvo -I../../libvo -I/usr/X11R6/include -O4 -march=pentium3 -mcpu=pentium3 -pipe -ffast-math -fomit-frame-pointer -D_REENTRANT -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -I/usr/include/gtk-1.2 -I/usr/include/glib-1.2 -I/usr/lib/glib/include -I/usr/X11R6/include -fexpensive-optimizations -fschedule-insns2 -Wall -I. -I../loader -I./wm -I./skin -I/usr/include/freetype2 -I/usr/include/gtk-1.2 -I/usr/include/glib-1.2 -I/usr/lib/glib/include -I/usr/X11R6/include -I/usr/include/gtk-1.2 -I/usr/include/glib-1.2 -I/usr/lib/glib/include -I/usr/X11R6/include  -DDEBUG  -o mplayer/sw.o mplayer/sw.c
In file included from ../libvo/sub.h:59,
                 from ../mplayer.h:5,
                 from interface.h:7,
                 from mplayer/sw.c:11:
../subreader.h:58: error: syntax error before '*' token
make[1]: *** [mplayer/sw.o] Error 1



> Index: subreader.h
> ===================================================================
> RCS file: /cvsroot/mplayer/main/subreader.h,v
> retrieving revision 1.32
> retrieving revision 1.33
> diff -u -r1.32 -r1.33
> --- subreader.h	8 May 2004 17:52:25 -0000	1.32
> +++ subreader.h	28 Jul 2004 12:40:34 -0000	1.33
> @@ -53,8 +53,9 @@
>  
>  sub_data* sub_read_file (char *filename, float pts);
>  subtitle* subcp_recode1 (subtitle *sub);
> -void subcp_open (char *current_sub_cp); /* for demux_ogg.c */
> -void subcp_open_noenca (); /* for demux_ogg.c */
> +// enca_fd is the file enca uses to determine the codepage.
> +// setting to NULL disables enca.
> +void subcp_open (FILE *enca_fd); /* for demux_ogg.c */
                    ^^^^^^
cc -c -I../libvo -I../../libvo -I/usr/X11R6/include -O4 -march=pentium3 -mcpu=pentium3 -pipe -ffast-math -fomit-frame-pointer -D_REENTRANT -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -I/usr/include/gtk-1.2 -I/usr/include/glib-1.2 -I/usr/lib/glib/include -I/usr/X11R6/include -fexpensive-optimizations -fschedule-insns2 -Wall -I. -I../loader -I./wm -I./skin -I/usr/include/freetype2 -I/usr/include/gtk-1.2 -I/usr/include/glib-1.2 -I/usr/lib/glib/include -I/usr/X11R6/include -I/usr/include/gtk-1.2 -I/usr/include/glib-1.2 -I/usr/lib/glib/include -I/usr/X11R6/include  -DDEBUG  -o mplayer/sw.o mplayer/sw.c
In file included from ../libvo/sub.h:59,
                 from ../mplayer.h:5,
                 from interface.h:7,
                 from mplayer/sw.c:11:
../subreader.h:58: error: syntax error before '*' token
make[1]: *** [mplayer/sw.o] Error 1



Adding #include <stdio.h> to subreader.h made the compile finish successfully.
Is this a bad way of fixing it, though?

>  void subcp_close (void); /* for demux_ogg.c */
>  char ** sub_filenames(char *path, char *fname);
>  void list_sub_file(sub_data* subd);
> 
> _______________________________________________
> Mplayer-cvslog mailing list
> Mplayer-cvslog at mplayerhq.hu
> http://mplayerhq.hu/mailman/listinfo/mplayer-cvslog
> 
>