This is the mail archive of the
binutils@sourceware.org
mailing list for the binutils project.
Commit: RX: Rename 'eof' local variable
- From: Nick Clifton <nickc at redhat dot com>
- To: binutils at sourceware dot org
- Date: Wed, 18 Dec 2013 11:50:40 +0000
- Subject: Commit: RX: Rename 'eof' local variable
- Authentication-results: sourceware.org; auth=none
Hi Guys,
I am checking in the patch below to rename the local variable 'eof' in
gas/config/tc-rx.c. It turns out that 'eof' is defined in a MinGW
system header file and so causes a compile time conflict.
Cheers
Nick
gas/ChangeLog
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.
diff --git a/gas/config/tc-rx.c b/gas/config/tc-rx.c
index f15ed93..0e4b7a8 100644
--- 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