From c3185246ca255bd2b2d9462da064e5f20556acb9 Mon Sep 17 00:00:00 2001
From: James Le Cuirot <chewi@gentoo.org>
Date: Sun, 26 Apr 2020 20:28:12 +0100
Subject: [PATCH] Use the noyywrap lex option instead of adding hacky yywrap
 functions

---
 kbdlexer.l | 4 +---
 lex.l      | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/kbdlexer.l b/kbdlexer.l
index 8f75d78..f69a0a6 100644
--- a/kbdlexer.l
+++ b/kbdlexer.l
@@ -1,3 +1,4 @@
+%option noyywrap
 %{
 #include <X11/Xmu/CharSet.h>
 #include <string.h>
@@ -139,9 +140,6 @@ int parse_keyword(char *str, YYSTYPE *val)
                           progname, yytext); }
 %%
 
-#ifndef yywrap
-int yywrap() { return 1; }
-#endif
 #undef input
 #define input() ((*inptr)?(*inptr++):0)
 #undef unput
diff --git a/lex.l b/lex.l
index 5f653d2..fc912d4 100644
--- a/lex.l
+++ b/lex.l
@@ -1,3 +1,4 @@
+%option noyywrap
 %{
 #include <stdio.h>
 #include "gram.h"
@@ -6,7 +7,6 @@ extern int ParseError;
 extern FILE *rcfile;
 #undef yyin
 #define yyin rcfile
-#define yywrap() 1
 extern int parse_keyword(char *);
 void fixup_string(char *, char *);
 #define YY_SKIP_YYWRAP