| Message ID | 20210614090723.30208-1-drjones@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [kvm-unit-tests] generators: unify header guards | expand |
On Mon, Jun 14 2021, Andrew Jones <drjones@redhat.com> wrote: > Signed-off-by: Andrew Jones <drjones@redhat.com> > --- > configure | 4 ++-- > scripts/asm-offsets.mak | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/configure b/configure > index 4ad5a4bcd782..b8442d61fb60 100755 > --- a/configure > +++ b/configure > @@ -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. > diff --git a/scripts/asm-offsets.mak b/scripts/asm-offsets.mak > index 7b64162dd2e1..2b9be2b439f4 100644 > --- a/scripts/asm-offsets.mak > +++ b/scripts/asm-offsets.mak > @@ -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: Reviewed-by: Cornelia Huck <cohuck@redhat.com>
diff --git a/configure b/configure index 4ad5a4bcd782..b8442d61fb60 100755 --- a/configure +++ b/configure @@ -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. * diff --git a/scripts/asm-offsets.mak b/scripts/asm-offsets.mak index 7b64162dd2e1..2b9be2b439f4 100644 --- a/scripts/asm-offsets.mak +++ b/scripts/asm-offsets.mak @@ -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 " *"; \
Signed-off-by: Andrew Jones <drjones@redhat.com> --- configure | 4 ++-- scripts/asm-offsets.mak | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)