From 1a7c7c062e46c74e4af1a0f7f4863a1f7c7036d8 Mon Sep 17 00:00:00 2001
From: David Howells <dhowells@redhat.com>
Date: Mon, 26 Nov 2012 16:29:39 -0800
Subject: [PATCH] --- yaml --- r: 336036 b: refs/heads/master c:
 56c176c9cac9a77249fa1736bfd792f379d61942 h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/scripts/headers_install.pl | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index a6a7336abe3b..3560fb3f98cb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c5782e9f5a535af09d7834693a52afdbcc6e5f3f
+refs/heads/master: 56c176c9cac9a77249fa1736bfd792f379d61942
diff --git a/trunk/scripts/headers_install.pl b/trunk/scripts/headers_install.pl
index 239d22d4207b..6c353ae8a451 100644
--- a/trunk/scripts/headers_install.pl
+++ b/trunk/scripts/headers_install.pl
@@ -42,6 +42,9 @@
 		$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 /* !;
 		printf {$out} "%s", $line;
 	}
 	close $out;