2009-10-14 Andreas Schwab <schwab@linux-m68k.org>

	* ldlex.l (yy_input): Remove second argument and return the value
	instead.
	(YY_INPUT): Adjust.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index fb611c456d8ac4ca3c37ebc2068007362f74e13e..31c034809b3e309b682c06e16d277dd96945f479 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,9 @@
+2009-10-14  Andreas Schwab  <schwab@linux-m68k.org>
+
+       * ldlex.l (yy_input): Remove second argument and return the value
+       instead.
+       (YY_INPUT): Adjust.
+
 2009-10-14  Ryan Mansfield  <rmansfield@qnx.com>
 
        * ldlang.c (load_symbols): Set whole_archive from entry when

diff --git a/ld/ldlex.l b/ld/ldlex.l
index 25b4c73a3605a28f622969bb1e69a9600374064f..ef09eb0412af2ebbe0b9edeac07fcd780c53d0cd 100644 (file)
--- a/ld/ldlex.l
+++ b/ld/ldlex.l
@@ -57,7 +57,7 @@ const char *lex_string = NULL;
    Otherwise, stack elements 0 through `include_stack_ptr - 1' are valid.  */
 
 #undef YY_INPUT
-#define YY_INPUT(buf,result,max_size) yy_input (buf, &result, max_size)
+#define YY_INPUT(buf,result,max_size) result = yy_input (buf, max_size)
 
 #define YY_NO_UNPUT
 
@@ -68,7 +68,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 int yy_input (char *, int);
 static void comment (void);
 static void lex_warn_invalid (char *where, char *what);
 
@@ -608,22 +608,23 @@ ldlex_popstate (void)
 }
 \f
 
-/* Place up to MAX_SIZE characters in BUF and return in *RESULT
+/* Place up to MAX_SIZE characters in BUF and return
    either the number of characters read, or 0 to indicate EOF.  */
 
-static void
-yy_input (char *buf, int *result, int max_size)
+static int
+yy_input (char *buf, int max_size)
 {
-  *result = 0;
+  int result = 0;
   if (YY_CURRENT_BUFFER->yy_input_file)
     {
       if (yyin)
        {
-         *result = fread (buf, 1, max_size, yyin);
-         if (*result < max_size && ferror (yyin))
+         result = fread (buf, 1, max_size, yyin);
+         if (result < max_size && ferror (yyin))
            einfo ("%F%P: read in flex scanner failed\n");
        }
     }
+  return result;
 }
 
 /* Eat the rest of a C-style comment.  */