From: Thomas V. S. <tho...@us...> - 2002-09-19 21:21:44
|
CVS Root: /cvsroot/gstreamer Module: gstreamer Changes by: thomasvs Date: Thu Sep 19 2002 14:21:43 PDT Branch: BRANCH-RELEASE-0_4_1 Log message: backport ds's fix Modified files: gst/parse : Makefile.am grammar.y Links: http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/parse/Makefile.am.diff?r1=1.6&r2=1.6.2.1 http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/parse/grammar.y.diff?r1=1.7&r2=1.7.4.1 ====Begin Diffs==== Index: Makefile.am =================================================================== RCS file: /cvsroot/gstreamer/gstreamer/gst/parse/Makefile.am,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -u -d -r1.6 -r1.6.2.1 --- Makefile.am 13 Aug 2002 16:30:58 -0000 1.6 +++ Makefile.am 19 Sep 2002 21:21:31 -0000 1.6.2.1 @@ -1,20 +1,20 @@ noinst_LTLIBRARIES = libgstparse.la -libgstparse_la_SOURCES = lex.yy.c grammar.tab.c +libgstparse_la_SOURCES = lex._gst_parse_yy.c grammar.tab.c -BISON = bison -d -v +BISON = bison -d -v -p_gst_parse__yy libgstparse_la_CFLAGS = $(LIBGST_CFLAGS) libgstparse_la_LIBADD = $(LIBGST_LIBS) noinst_HEADERS = grammar.tab.h -BUILT_SOURCES = grammar.tab.h grammar.tab.c lex.yy.c +BUILT_SOURCES = grammar.tab.h grammar.tab.c lex._gst_parse_yy.c EXTRA_DIST = grammar.y parse.l types.h grammar.tab.c grammar.tab.h: grammar.y $(BISON) $^ -lex.yy.c: parse.l - flex $^ +lex._gst_parse_yy.c: parse.l + flex -P_gst_parse_yy $^ Index: grammar.y =================================================================== RCS file: /cvsroot/gstreamer/gstreamer/gst/parse/grammar.y,v retrieving revision 1.7 retrieving revision 1.7.4.1 diff -u -d -r1.7 -r1.7.4.1 --- grammar.y 5 May 2002 17:45:41 -0000 1.7 +++ grammar.y 19 Sep 2002 21:21:31 -0000 1.7.4.1 @@ -123,7 +123,7 @@ %% -extern FILE *yyin; +extern FILE *_gst_parse_yyin; int _gst_parse_yylex (YYSTYPE *lvalp); static int yylex (void *lvalp) { @@ -137,7 +137,7 @@ return -1; } -int yy_scan_string (char*); +int _gst_parse_yy_scan_string (char*); graph_t * _gst_parse_launch (const gchar *str, GError **error) { @@ -147,10 +147,10 @@ g_return_val_if_fail (str != NULL, NULL); dstr = g_strdup (str); - yy_scan_string (dstr); + _gst_parse_yy_scan_string (dstr); #ifdef DEBUG - yydebug = 1; + _gst_parse_yydebug = 1; #endif if (yyparse (&g) != 0) { |