From 2472b819eabc76376d5552bd72b4f1f3cfa589da Mon Sep 17 00:00:00 2001 From: Mike Swanson Date: Sun, 22 Jan 2017 10:49:44 -0800 Subject: [PATCH] programs/winhlp32: Use noyywrap for macro.lex.l and prefix flex 2.6.3 broke the previous version, but this is a well-supported way of achieving the same goal, used elsewhere in the Wine source too. To avoid warnings in compilation, also set prefix="winhlp32_" -- this is consistent with how other lex files work too. Signed-off-by: Mike Swanson --- programs/winhlp32/macro.lex.l | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/programs/winhlp32/macro.lex.l b/programs/winhlp32/macro.lex.l index 8f6945ca98..2e03660278 100644 --- a/programs/winhlp32/macro.lex.l +++ b/programs/winhlp32/macro.lex.l @@ -20,7 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ %} -%option noinput nounput never-interactive 8bit +%option noinput nounput noyywrap never-interactive 8bit +%option prefix="winhlp32_" %x quote %{ #include "config.h" @@ -367,7 +368,3 @@ WINHELP_WINDOW* MACRO_CurrentWindow(void) { return lex_data ? lex_data->window : Globals.active_win; } - -#ifndef yywrap -int yywrap(void) { return 1; } -#endif -- 2.11.0