[newlib-cygwin] Cygwin: gentls_offsets: Remove obsolte 'o' regex option

Corinna Vinschen corinna@sourceware.org
Tue Jan 15 12:20:00 GMT 2019


https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=4d2d891b99840e4dc73f8d5f7ec45a5d616db59d

commit 4d2d891b99840e4dc73f8d5f7ec45a5d616db59d
Author: Corinna Vinschen <corinna@vinschen.de>
Date:   Tue Jan 15 13:19:41 2019 +0100

    Cygwin: gentls_offsets: Remove obsolte 'o' regex option
    
    Signed-off-by: Corinna Vinschen <corinna@vinschen.de>

Diff:
---
 winsup/cygwin/gentls_offsets | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/winsup/cygwin/gentls_offsets b/winsup/cygwin/gentls_offsets
index 745ea27..59080c3 100755
--- a/winsup/cygwin/gentls_offsets
+++ b/winsup/cygwin/gentls_offsets
@@ -26,21 +26,21 @@ substr($tls, 0, length($pre)) = '';
 $pre .= "\n//*/";
 $tls =~ s%/\*\s*gentls_offsets.*?/\*\s*gentls_offsets\s*\*/%%ogs;
 foreach ($tls =~ /^.*\n/mg) {
-    /^}|\s*(?:typedef|const)/o and do {
+    /^}|\s*(?:typedef|const)/ and do {
 	$def .= $_ ;
 	next;
     };
     $def .= $_ if $struct;
-    if (!s/;.*$//o) {
-	if (!$struct && /^\s*(?:struct|class)\s*([a-z_0-9]+)/o) {
+    if (!s/;.*$//) {
+	if (!$struct && /^\s*(?:struct|class)\s*([a-z_0-9]+)/) {
 	    $def .= $_;
 	    $struct = $1
 	}
 	next;
     }
-    s/(?:\[[^\]]*\]|struct|class)//o;
-    s/^\s+\S+\s+//o;
-    s/[\*\s()]+//go;
+    s/(?:\[[^\]]*\]|struct|class)//;
+    s/^\s+\S+\s+//;
+    s/[\*\s()]+//g;
     for my $f (split(/,/)) {
 	push(@fields, $f);
     }



More information about the Cygwin-cvs mailing list