Skip to contentSkip to conversation

generators: unify header guards

PATCH In review Andrew Jones 2 participants 2 messages Jun 14, 2021 KVM

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 generators: unify header guards

---
 configure               | 4 ++--
 scripts/asm-offsets.mak | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
configure +2 -2
index 4ad5a4bcd782..b8442d61fb60 100755
@@ -332,8 +332,8 @@ if [ "$arch" = "arm" ] || [ "$arch" = "arm64" ]; then
 fi
 
 cat <<EOF > lib/config.h
-#ifndef CONFIG_H
-#define CONFIG_H 1
+#ifndef _CONFIG_H_
+#define _CONFIG_H_
 /*
  * Generated file. DO NOT MODIFY.
  *
scripts/asm-offsets.mak +2 -2
index 7b64162dd2e1..2b9be2b439f4 100644
@@ -17,8 +17,8 @@ endef
 
 define make_asm_offsets
 	(set -e; \
-	 echo "#ifndef __ASM_OFFSETS_H__"; \
-	 echo "#define __ASM_OFFSETS_H__"; \
+	 echo "#ifndef _ASM_OFFSETS_H_"; \
+	 echo "#define _ASM_OFFSETS_H_"; \
 	 echo "/*"; \
 	 echo " * Generated file. DO NOT MODIFY."; \
 	 echo " *"; \
Signature · 1 line
2.31.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 11 lines · Andrew Jones
---
 configure               | 4 ++--
 scripts/asm-offsets.mak | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
configure +0 -0
index 4ad5a4bcd782..b8442d61fb60 100755

configure if [ "$arch" = "arm" ] || [ "$arch" = "arm64" ]; then · line 339

Quoted 10 lines
configure +2 -2
@@ -332,8 +332,8 @@ if [ "$arch" = "arm" ] || [ "$arch" = "arm64" ]; then
 fi
 
 cat <<EOF > lib/config.h
-#ifndef CONFIG_H
-#define CONFIG_H 1
+#ifndef _CONFIG_H_
+#define _CONFIG_H_
 /*
  * Generated file. DO NOT MODIFY.
  *

Already changed in "header guards: clean up some stragglers", seems that patch has not been applied yet.

Quoted 5 lines
scripts/asm-offsets.mak +0 -0
index 7b64162dd2e1..2b9be2b439f4 100644

scripts/asm-offsets.mak endef · line 24

Quoted 10 lines
scripts/asm-offsets.mak +2 -2
@@ -17,8 +17,8 @@ endef
 
 define make_asm_offsets
 	(set -e; \
-	 echo "#ifndef __ASM_OFFSETS_H__"; \
-	 echo "#define __ASM_OFFSETS_H__"; \
+	 echo "#ifndef _ASM_OFFSETS_H_"; \
+	 echo "#define _ASM_OFFSETS_H_"; \
 	 echo "/*"; \
 	 echo " * Generated file. DO NOT MODIFY."; \
 	 echo " *"; \

For the second hunk: