aboutsummaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2013-01-02 15:13:02 +0000
committerLinus Torvalds <torvalds@linux-foundation.org>2013-01-02 17:36:10 -0800
commit8a7eab2b54b349d005181fd971cfa027b1976c7b (patch)
tree42ba4b4248c3907d0876097488a5c2b7de53fe92 /scripts
parent3d33fcc11bdd11b6949cf5c406726a094395dc4f (diff)
downloadlinux-8a7eab2b54b349d005181fd971cfa027b1976c7b.tar.gz
UAPI: Strip _UAPI prefix on header install no matter the whitespace
Commit 56c176c9cac9 ("UAPI: strip the _UAPI prefix from header guards during header installation") strips the _UAPI prefix from header guards, but only if there's a single space between the cpp directive and the label. Make it more flexible and able to handle tabs and multiple white space characters. Signed-off-by: David Howells <dhowell@redhat.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/headers_install.pl6
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/headers_install.pl b/scripts/headers_install.pl
index 6c353ae8a45..581ca99c96f 100644
--- a/scripts/headers_install.pl
+++ b/scripts/headers_install.pl
@@ -42,9 +42,9 @@ foreach my $filename (@files) {
$line =~ s/(^|\s)(inline)\b/$1__$2__/g;
$line =~ s/(^|\s)(asm)\b(\s|[(]|$)/$1__$2__$3/g;
$line =~ s/(^|\s|[(])(volatile)\b(\s|[(]|$)/$1__$2__$3/g;
- $line =~ s/#ifndef _UAPI/#ifndef /;
- $line =~ s/#define _UAPI/#define /;
- $line =~ s!#endif /[*] _UAPI!#endif /* !;
+ $line =~ s/#ifndef\s+_UAPI/#ifndef /;
+ $line =~ s/#define\s+_UAPI/#define /;
+ $line =~ s!#endif\s+/[*]\s*_UAPI!#endif /* !;
printf {$out} "%s", $line;
}
close $out;