* config/tc-rx.c (rx_include): Rename 'eof' to 'last_char' in

	order to avoid conflict with same named variable in MinGW system
	header file.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index bb29b12b6b6645641c7ace8f9967d1601d59f292..c658d734327595f9fb8da1679567fb70a496d52f 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,9 @@
+2013-12-18  Nick Clifton  <nickc@redhat.com>
+
+       * config/tc-rx.c (rx_include): Rename 'eof' to 'last_char' in
+       order to avoid conflict with same named variable in MinGW system
+       header file.
+
 2013-12-13  Nick Clifton  <nickc@redhat.com>
 
        * config/tc-msp430.c (mcu_types): Add some more 430X mcu names.

diff --git a/gas/config/tc-rx.c b/gas/config/tc-rx.c
index f15ed93c4d4cd55340d06014780eecd1421e7990..0e4b7a81830c5c35a80e990142cec06a82449dde 100644 (file)
--- a/gas/config/tc-rx.c
+++ b/gas/config/tc-rx.c
@@ -244,7 +244,7 @@ rx_include (int ignore)
   char * path;
   char * filename;
   char * current_filename;
-  char * eof;
+  char * last_char;
   char * p;
   char * d;
   char * f;
@@ -263,17 +263,17 @@ rx_include (int ignore)
 
   /* Get the filename.  Spaces are allowed, NUL characters are not.  */
   filename = input_line_pointer;
-  eof = find_end_of_line (filename, FALSE);
-  input_line_pointer = eof;
-
-  while (eof >= filename && (* eof == ' ' || * eof == '\n'))
-    -- eof;
-  end_char = *(++ eof);
-  * eof = 0;
-  if (eof == filename)
+  last_char = find_end_of_line (filename, FALSE);
+  input_line_pointer = last_char;
+
+  while (last_char >= filename && (* last_char == ' ' || * last_char == '\n'))
+    -- last_char;
+  end_char = *(++ last_char);
+  * last_char = 0;
+  if (last_char == filename)
     {
       as_bad (_("no filename following .INCLUDE pseudo-op"));
-      * eof = end_char;
+      * last_char = end_char;
       return;
     }
 
@@ -385,7 +385,7 @@ rx_include (int ignore)
       input_scrub_insert_file (path);
     }
 
-  * eof = end_char;
+  * last_char = end_char;
 }
 
 static void