From 07b35a23c3ccecde85e80fd9981abf2e15c1384b Mon Sep 17 00:00:00 2001 From: Marc-André Lureau Date: Thu, 10 Dec 2020 17:47:52 +0400 Subject: compiler.h: remove QEMU_GNUC_PREREQ When needed, the G_GNUC_CHECK_VERSION() glib macro can be used instead. Signed-off-by: Marc-André Lureau Message-Id: <20201210134752.780923-14-marcandre.lureau@redhat.com> Signed-off-by: Paolo Bonzini --- scripts/cocci-macro-file.h | 1 - 1 file changed, 1 deletion(-) (limited to 'scripts') diff --git a/scripts/cocci-macro-file.h b/scripts/cocci-macro-file.h index c6bbc05ba3..20eea6b708 100644 --- a/scripts/cocci-macro-file.h +++ b/scripts/cocci-macro-file.h @@ -19,7 +19,6 @@ */ /* From qemu/compiler.h */ -#define QEMU_GNUC_PREREQ(maj, min) 1 #define QEMU_NORETURN __attribute__ ((__noreturn__)) #define QEMU_WARN_UNUSED_RESULT __attribute__((warn_unused_result)) #define QEMU_SENTINEL __attribute__((sentinel)) -- cgit v1.2.3-55-g7522 From a1bcbb485c91c0869832b0bda62ff564ddfc52f3 Mon Sep 17 00:00:00 2001 From: Philippe Mathieu-Daudé Date: Sun, 13 Dec 2020 21:51:32 +0100 Subject: scripts/git.orderfile: Keep files with .inc extension sorted Sort .inc files along with the extension including them. Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20201213205132.243628-1-f4bug@amsat.org> Signed-off-by: Paolo Bonzini --- scripts/git.orderfile | 3 +++ 1 file changed, 3 insertions(+) (limited to 'scripts') diff --git a/scripts/git.orderfile b/scripts/git.orderfile index 3736c1d6af..b32203b710 100644 --- a/scripts/git.orderfile +++ b/scripts/git.orderfile @@ -12,6 +12,7 @@ # Documentation docs/* *.rst +*.rst.inc # build system configure @@ -28,9 +29,11 @@ qga/*.json # headers *.h +*.h.inc # decoding tree specification *.decode # code *.c +*.c.inc -- cgit v1.2.3-55-g7522