This is the mail archive of the
cygwin-patches
mailing list for the Cygwin project.
[PATCH] mkglobals: Fix EOL detection
- From: Orgad Shaneh <orgads at gmail dot com>
- To: cygwin-patches at cygwin dot com
- Date: Mon, 17 Aug 2015 10:41:59 +0300
- Subject: [PATCH] mkglobals: Fix EOL detection
- Authentication-results: sourceware.org; auth=none
When globals.cc has CRLF line endings, winsup.h is not removed, and
compilation fails for duplicate definitions.
---
winsup/cygwin/mkglobals_h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/winsup/cygwin/mkglobals_h b/winsup/cygwin/mkglobals_h
index ea4a582..2d185f2 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. */
--
2.4.6.windows.1