Module: wine Branch: refs/heads/master Commit: 0ae2c69c7a8368553156945d3475a3d97043a98f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0ae2c69c7a8368553156945d...
Author: Alexandre Julliard julliard@winehq.org Date: Tue Jan 3 12:16:05 2006 +0100
Added some flex options to avoid compiler warnings. Moved options from the Makefile into the source.
---
libs/wpp/Makefile.in | 3 +-- libs/wpp/ppl.l | 6 ++++-- programs/winedbg/debug.l | 2 ++ programs/winhelp/macro.lex.l | 1 + tools/widl/Makefile.in | 3 +-- tools/widl/parser.l | 5 +++-- tools/wrc/Makefile.in | 3 +-- tools/wrc/parser.l | 3 ++- 8 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/libs/wpp/Makefile.in b/libs/wpp/Makefile.in index 6250fb1..58a374c 100644 --- a/libs/wpp/Makefile.in +++ b/libs/wpp/Makefile.in @@ -2,7 +2,6 @@ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ -LEXOPT = -Cf #-w -b MODULE = libwpp.a
C_SRCS = \ @@ -29,7 +28,7 @@ ppy.tab.h: ppy.tab.c ppy.tab.o: ppy.tab.h
@LEX_OUTPUT_ROOT@.c: ppl.l - $(LEX) $(LEXOPT) -d -Ppp -o$@ -8 $(SRCDIR)/ppl.l + $(LEX) -o$@ $(SRCDIR)/ppl.l
@LEX_OUTPUT_ROOT@.o: ppy.tab.h
diff --git a/libs/wpp/ppl.l b/libs/wpp/ppl.l index e08e84c..020f91f 100644 --- a/libs/wpp/ppl.l +++ b/libs/wpp/ppl.l @@ -1,4 +1,4 @@ -/* +/* -*-C-*- * Wrc preprocessor lexical analysis * * Copyright 1999-2000 Bertho A. Stultiens (BS) @@ -125,7 +125,9 @@ * Special flex options and exclusive scanner start-conditions */ %option stack -%option never-interactive +%option 8bit never-interactive +%option nounput +%option prefix="pp"
%x pp_pp %x pp_eol diff --git a/programs/winedbg/debug.l b/programs/winedbg/debug.l index cc3e6f8..c5aa044 100644 --- a/programs/winedbg/debug.l +++ b/programs/winedbg/debug.l @@ -19,6 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
+%option nounput + %{ #include <stdlib.h> #include <string.h> diff --git a/programs/winhelp/macro.lex.l b/programs/winhelp/macro.lex.l index c35c5a6..b614821 100644 --- a/programs/winhelp/macro.lex.l +++ b/programs/winhelp/macro.lex.l @@ -20,6 +20,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ %} +%option nounput %x quote %{ #include <assert.h> diff --git a/tools/widl/Makefile.in b/tools/widl/Makefile.in index 6d52a59..6d10d19 100644 --- a/tools/widl/Makefile.in +++ b/tools/widl/Makefile.in @@ -2,7 +2,6 @@ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ -LEXOPT = -Cf #-w -b EXEEXT = @EXEEXT@
PROGRAMS = widl$(EXEEXT) @@ -39,7 +38,7 @@ parser.tab.h: parser.tab.c parser.tab.o: parser.tab.h
@LEX_OUTPUT_ROOT@.c: parser.l - $(LEX) $(LEXOPT) -d -8 $(SRCDIR)/parser.l + $(LEX) $(SRCDIR)/parser.l
@LEX_OUTPUT_ROOT@.o: parser.tab.h
diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 43ed190..4955bad 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -1,4 +1,4 @@ -/* +/* -*-C-*- * IDL Compiler * * Copyright 2002 Ove Kaaven @@ -19,7 +19,8 @@ */
%option stack -%option never-interactive +%option nounput noyy_top_state +%option 8bit never-interactive
nl \r?\n ws [ \f\t\r] diff --git a/tools/wrc/Makefile.in b/tools/wrc/Makefile.in index 49c913e..f482be4 100644 --- a/tools/wrc/Makefile.in +++ b/tools/wrc/Makefile.in @@ -3,7 +3,6 @@ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ -LEXOPT = -Cf #-w -b EXEEXT = @EXEEXT@
PROGRAMS = wrc$(EXEEXT) @@ -38,7 +37,7 @@ parser.tab.h: parser.tab.c parser.tab.o: parser.tab.h
@LEX_OUTPUT_ROOT@.c: parser.l - $(LEX) $(LEXOPT) -d -8 $(SRCDIR)/parser.l + $(LEX) $(SRCDIR)/parser.l
@LEX_OUTPUT_ROOT@.o: parser.tab.h
diff --git a/tools/wrc/parser.l b/tools/wrc/parser.l index d8abcad..cbdf9b6 100644 --- a/tools/wrc/parser.l +++ b/tools/wrc/parser.l @@ -87,7 +87,8 @@ %x pp_code_page
%option stack -%option never-interactive +%option nounput noyy_top_state +%option 8bit never-interactive
/* Some shortcut definitions */ ws [ \f\t\r]
-
Alexandre Julliard