espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-18 08:38:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
order to avoid conflict with same named variable in MinGW system
	header file.
This commit is contained in:
Nick Clifton
2013-12-18 11:51:25 +00:00
parent b9e95fa2d1
commit 720fbed62e
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gas/ChangeLog
View File

@ -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> 2013-12-13 Nick Clifton <nickc@redhat.com>
* config/tc-msp430.c (mcu_types): Add some more 430X mcu names. * config/tc-msp430.c (mcu_types): Add some more 430X mcu names.

20
gas/config/tc-rx.c
View File

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