Message ID | 20220525095338.3494742-1-martin@martin.st |
---|---|
State | Accepted |
Headers | show |
Series | [FFmpeg-devel,GASPP] Ignore trailing whitespace in .ifc directives | expand |
Context | Check | Description |
---|---|---|
yinshiyou/configure_loongarch64 | warning | Failed to apply patch |
andriy/configure_x86 | warning | Failed to apply patch |
andriy/configure_armv7_RPi4 | warning | Failed to apply patch |
On Wed, 25 May 2022, Martin Storsjö wrote: > This fixes handling of cases like ".ifc \foo, bar // comment", where > there was trailing whitespace after the condition (before the comment > which already was stripped out at this point). > --- > Will apply after a couple days. > > This fixes the "lavc/aarch64: add hevc horizontal qpel/uni/bi" patch > when built with MSVC. > --- > gas-preprocessor.pl | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/gas-preprocessor.pl b/gas-preprocessor.pl > index 59c93c1..47cb5ab 100755 > --- a/gas-preprocessor.pl > +++ b/gas-preprocessor.pl > @@ -344,7 +344,7 @@ sub handle_if { > $expr =~ s/\s//g; > $result ^= $expr eq ""; > } elsif ($type eq "c") { > - if ($expr =~ /(.*)\s*,\s*(.*)/) { > + if ($expr =~ /(\S*)\s*,\s*(\S*)/) { > $result ^= $1 eq $2; > } else { > die "argument to .ifc not recognized"; > -- > 2.25.1 Pushed this now. // Martin
diff --git a/gas-preprocessor.pl b/gas-preprocessor.pl index 59c93c1..47cb5ab 100755 --- a/gas-preprocessor.pl +++ b/gas-preprocessor.pl @@ -344,7 +344,7 @@ sub handle_if { $expr =~ s/\s//g; $result ^= $expr eq ""; } elsif ($type eq "c") { - if ($expr =~ /(.*)\s*,\s*(.*)/) { + if ($expr =~ /(\S*)\s*,\s*(\S*)/) { $result ^= $1 eq $2; } else { die "argument to .ifc not recognized";