diff options
| author | Orgad Shaneh <orgads@gmail.com> | 2015-08-17 11:05:20 +0200 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2015-08-17 11:05:43 +0200 |
| commit | ede983934cd75d8149e9fcd1b8419c1db6ada1fa (patch) | |
| tree | f285d089b0f4538afdb15fd8bd782ea10ee4aa42 | |
| parent | 861a27db66fa86e3c745a5b4234063037c67ddf9 (diff) | |
| download | cygnal-ede983934cd75d8149e9fcd1b8419c1db6ada1fa.tar.gz cygnal-ede983934cd75d8149e9fcd1b8419c1db6ada1fa.tar.bz2 cygnal-ede983934cd75d8149e9fcd1b8419c1db6ada1fa.zip | |
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>
| -rw-r--r-- | winsup/cygwin/ChangeLog | 4 | ||||
| -rwxr-xr-x | winsup/cygwin/mkglobals_h | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 3a2f981a5..03a850a3a 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -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> * fhandler_proc.cc (format_proc_cpuinfo): Print cpb and eff_freq_ro diff --git a/winsup/cygwin/mkglobals_h b/winsup/cygwin/mkglobals_h index ea4a582f4..2d185f2e8 100755 --- a/winsup/cygwin/mkglobals_h +++ b/winsup/cygwin/mkglobals_h @@ -1,6 +1,7 @@ #!/usr/bin/perl my @argv = @ARGV; $_ = join('', <>); +s/\s+\n/\n/sog; s/\n[^\n]*!globals.h[^\n]*\n/\n/sog; s%/\*.*?\*/%%sog; s/(enum\s.*?{.*?})/munge($1)/soge; @@ -12,7 +13,6 @@ s/^\n+//sog; s/#include "winsup\.h"\n//so; s/-NL-/\n/sog; s/-EQ-/=/sog; -s/\s+\n/\n/sog; s/\n{2,}/\n/sog; print <<PRELUDE,$_; /* $target - Autogenerated from @argv. Look there for comments. */ |