[PATCH 2/2] UAPI: Strip _UAPI prefix on header install no matterthe whitespace

[David Howells]

The following commit:

	commit 56c176c9cac9a77249fa1736bfd792f379d61942
	Author: David Howells <dhowells@xxxxxxxxxx>
	Date:   Mon Nov 26 16:29:39 2012 -0800
	Subject: 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@xxxxxxxxxx>
---

 scripts/headers_install.pl |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/headers_install.pl b/scripts/headers_install.pl
index 6c353ae..581ca99 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;

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/