Improve compatibility with recent flex from flex.sourceforge.net.

2 files changed, 6 insertions, 6 deletions

diff --git a/contrib/binutils/binutils/arlex.l b/contrib/binutils/binutils/arlex.l
index 1560294..e0992f2 100644
--- a/contrib/binutils/binutils/arlex.l
+++ b/contrib/binutils/binutils/arlex.l
@@ -28,13 +28,13 @@ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
 #include "libiberty.h"
 #include "arparse.h"
 
-#define YY_NO_UNPUT
-
 extern int yylex (void);
 
 int linenumber;
 %}
 
+%option nounput
+
 %a 10000
 %o 25000
 
diff --git a/contrib/binutils/ld/ldlex.l b/contrib/binutils/ld/ldlex.l
index b0313d9..2f76c5a 100644
--- a/contrib/binutils/ld/ldlex.l
+++ b/contrib/binutils/ld/ldlex.l
@@ -63,8 +63,6 @@ const char *lex_string = NULL;
 #undef YY_INPUT
 #define YY_INPUT(buf,result,max_size) yy_input (buf, &result, max_size)
 
-#define YY_NO_UNPUT
-
 #define MAX_INCLUDE_DEPTH 10
 static YY_BUFFER_STATE include_stack[MAX_INCLUDE_DEPTH];
 static const char *file_name_stack[MAX_INCLUDE_DEPTH];
@@ -72,7 +70,7 @@ static unsigned int lineno_stack[MAX_INCLUDE_DEPTH];
 static unsigned int include_stack_ptr = 0;
 static int vers_node_nesting = 0;
 
-static void yy_input (char *, int *, int);
+static void yy_input (char *, yy_size_t *, yy_size_t);
 static void comment (void);
 static void lex_warn_invalid (char *where, char *what);
 
@@ -94,6 +92,8 @@ int yywrap (void) { return 1; }
 #endif
 %}
 
+%option nounput
+
 %a 4000
 %o 5000
 
@@ -612,7 +612,7 @@ ldlex_popstate (void)
    either the number of characters read, or 0 to indicate EOF.  */
 
 static void
-yy_input (char *buf, int *result, int max_size)
+yy_input (char *buf, yy_size_t *result, yy_size_t max_size)
 {
   *result = 0;
   if (YY_CURRENT_BUFFER->yy_input_file)