libs/newlib-cygwin
libs
/
newlib-cygwin
mirror of git://sourceware.org/git/newlib-cygwin.git
4
0
Fork 0
Code Issues Projects Releases Wiki Activity

mkglobals_h: Handle CRLF earlier. 

When globals.cc has CRLF line endings, winsup.h is not removed, and
	compilation fails for duplicate definitions.

Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
This commit is contained in:
Orgad Shaneh 2015-08-17 11:05:20 +02:00 committed by Corinna Vinschen
parent 861a27db66
commit ede983934c
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,7 @@
2015-08-17 Orgad Shaneh <orgads@gmail.com>
* mkglobals_h: Handle CRLF earlier.
2015-08-17 Corinna Vinschen <corinna@vinschen.de> 2015-08-17 Corinna Vinschen <corinna@vinschen.de>
* fhandler_proc.cc (format_proc_cpuinfo): Print cpb and eff_freq_ro * fhandler_proc.cc (format_proc_cpuinfo): Print cpb and eff_freq_ro

2
winsup/cygwin/mkglobals_h
View File

@ -1,6 +1,7 @@
#!/usr/bin/perl #!/usr/bin/perl
my @argv = @ARGV; my @argv = @ARGV;
$_ = join('', <>); $_ = join('', <>);
s/\s+\n/\n/sog;
s/\n[^\n]*!globals.h[^\n]*\n/\n/sog; s/\n[^\n]*!globals.h[^\n]*\n/\n/sog;
s%/\*.*?\*/%%sog; s%/\*.*?\*/%%sog;
s/(enum\s.*?{.*?})/munge($1)/soge; s/(enum\s.*?{.*?})/munge($1)/soge;
@ -12,7 +13,6 @@ s/^\n+//sog;
s/#include "winsup\.h"\n//so; s/#include "winsup\.h"\n//so;
s/-NL-/\n/sog; s/-NL-/\n/sog;
s/-EQ-/=/sog; s/-EQ-/=/sog;
s/\s+\n/\n/sog;
s/\n{2,}/\n/sog; s/\n{2,}/\n/sog;
print <<PRELUDE,$_; print <<PRELUDE,$_;
/* $target - Autogenerated from @argv. Look there for comments. */ /* $target - Autogenerated from @argv. Look there for comments. */