X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=binutils%2Fsyslex.l;h=254f52e7f06a370873303eb2272232af0ce8790b;hb=c7b15a66dc9ef2285f0983759d41baf5b9933505;hp=ae3c8d2655d63280cda80af6eea64e92327fbd14;hpb=943ea8a2b0cce77e272b34dd88b901b2b9b0e0a0;p=deliverable%2Fbinutils-gdb.git

diff --git a/binutils/syslex.l b/binutils/syslex.l
index ae3c8d2655..254f52e7f0 100644
--- a/binutils/syslex.l
+++ b/binutils/syslex.l
@@ -1,24 +1,27 @@
+%option noinput nounput noyywrap
+
 %{
-/* Copyright 2001, 2003, 2005 Free Software Foundation, Inc.
+/* Copyright (C) 2001-2018 Free Software Foundation, Inc.
+
+   This file is part of GNU Binutils.
 
-This file is part of GNU Binutils.
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3, or (at your option)
+   any later version.
 
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+   You should have received a copy of the GNU General Public License
+   along with GLD; see the file COPYING.  If not, write to the Free
+   Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA
+   02110-1301, USA.  */
 
-You should have received a copy of the GNU General Public License
-along with GLD; see the file COPYING.  If not, write to the Free
-Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.  */
+/* Note: config.h is #included via syslex_wrap.c.  */
 
-#include "config.h"
 #ifdef HAVE_STRING_H
 #include <string.h>
 #else
@@ -26,15 +29,11 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <strings.h>
 #endif
 #endif
+
 #include "sysinfo.h"
-char *word;
-int number;
-int unit;
 
+#ifndef YY_NO_UNPUT
 #define YY_NO_UNPUT
-
-#ifndef yywrap
-static int yywrap (void) { return 1; }
 #endif
 
 extern int yylex (void);
@@ -45,7 +44,7 @@ extern int yylex (void);
 "[" { return '[';}
 "]" { return ']';}
 " " { ; }
-";".* { ; } 
+";".* { ; }
 "\t" { ; }
 "\n" { ; }
 "\""[^\"]*"\"" {