Skip to contentSkip to conversation

kdbus: fix header guard name

PATCH In review [email protected] 3 participants 4 messages Mar 17, 2015

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 kdbus: fix header guard name

From: Lucas De Marchi <[email protected]>

UAPI headers have a _UAPI_ as prefix, which is removed during headers_install. If it's put as a suffix it will not be removed and will be the only header with UAPI in the header guard macro.

---
 include/uapi/linux/kdbus.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
include/uapi/linux/kdbus.h +2 -2
index fc1d77d..302862f 100644
@@ -5,8 +5,8 @@
  * your option) any later version.
  */
 
-#ifndef _KDBUS_UAPI_H_
-#define _KDBUS_UAPI_H_
+#ifndef _UAPI_KDBUS_H_
+#define _UAPI_KDBUS_H_
 
 #include <linux/ioctl.h>
 #include <linux/types.h>
Signature · 1 line
2.3.3
Reviewed-by on v1 1/1
#1 lore raw

Hi

Quoted 16 lines · On Tue, Mar 17, 2015 at 4:03 AM, <[email protected]> wrote:

From: Lucas De Marchi <[email protected]>

UAPI headers have a _UAPI_ as prefix, which is removed during headers_install. If it's put as a suffix it will not be removed and will be the only header with UAPI in the header guard macro.

---
 include/uapi/linux/kdbus.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
include/uapi/linux/kdbus.h +0 -0
index fc1d77d..302862f 100644

include/uapi/linux/kdbus.h line 9

Quoted 7 lines
include/uapi/linux/kdbus.h +2 -2
@@ -5,8 +5,8 @@
  * your option) any later version.
  */
 
-#ifndef _KDBUS_UAPI_H_
-#define _KDBUS_UAPI_H_
+#ifndef _UAPI_KDBUS_H_
+#define _UAPI_KDBUS_H_

Looks good, but lacks an update of the last line in this header:

#endif /* _KDBUS_UAPI_H_ */

With this comment changed:

Thanks
David!

Quoted 5 lines
include/uapi/linux/kdbus.h +0 -1
 #include <linux/ioctl.h>
 #include <linux/types.h>
--

2.3.3

#2 lore raw

PATCH 1/1 kdbus: fix header guard name

From: Lucas De Marchi <[email protected]>

UAPI headers have a _UAPI_ as prefix, which is removed during headers_install. If it's put as a suffix it will not be removed and will be the only header with UAPI in the header guard macro.

---
 include/uapi/linux/kdbus.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
include/uapi/linux/kdbus.h +3 -3
index fc1d77d..2fe0a1c 100644
@@ -5,8 +5,8 @@
  * your option) any later version.
  */
 
-#ifndef _KDBUS_UAPI_H_
-#define _KDBUS_UAPI_H_
+#ifndef _UAPI_KDBUS_H_
+#define _UAPI_KDBUS_H_
 
 #include <linux/ioctl.h>
 #include <linux/types.h>
@@ -976,4 +976,4 @@ enum kdbus_ioctl_type {
 					     struct kdbus_cmd_match),
 };
 
-#endif /* _KDBUS_UAPI_H_ */
+#endif /* _UAPI_KDBUS_H_ */
Signature · 1 line
2.3.3
#3 lore raw
Quoted 11 lines · On Tue, Mar 17, 2015 at 09:21:42AM -0300, [email protected] wrote:

From: Lucas De Marchi <[email protected]>

UAPI headers have a _UAPI_ as prefix, which is removed during headers_install. If it's put as a suffix it will not be removed and will be the only header with UAPI in the header guard macro.

---
 include/uapi/linux/kdbus.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Applied, thanks.

greg k-h