summary refs log tree commit diff stats
path: root/scripts/clean-includes
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2016-05-24 16:24:36 +0100
committerMichael Tokarev <mjt@tls.msk.ru>2016-06-07 18:19:24 +0300
commitdf891b9197f595e8676885a10e1c1735a4c261ba (patch)
treef83f13bde2df821dce6b57ea6e07a96969864b1e /scripts/clean-includes
parent20875332b0fedc89cfcc96586f0a34f5809ef7c9 (diff)
downloadfocaccia-qemu-df891b9197f595e8676885a10e1c1735a4c261ba.tar.gz
focaccia-qemu-df891b9197f595e8676885a10e1c1735a4c261ba.zip
clean-includes: Add glib.h to list of unneeded includes
osdep.h pulls in glib.h via glib-compat.h, so add it to the list of
includes that we remove. (This then means we must avoid running
clean-includes on glib-compat.h or it will delete the glib.h include.)

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Eric Blake <eblake@redhat.com>
Tested-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
Diffstat (limited to 'scripts/clean-includes')
-rwxr-xr-xscripts/clean-includes3
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/clean-includes b/scripts/clean-includes
index adffeddb71..37b73b5433 100755
--- a/scripts/clean-includes
+++ b/scripts/clean-includes
@@ -104,6 +104,7 @@ for f in "$@"; do
       ;;
     *include/qemu/osdep.h | \
     *include/qemu/compiler.h | \
+    *include/glib-compat.h | \
     *include/standard-headers/ )
       # Removing include lines from osdep.h itself would be counterproductive.
       echo "SKIPPING $f (special case header)"
@@ -143,7 +144,7 @@ for f in "$@"; do
            <setjmp.h> <stdarg.h> <stddef.h> <stdbool.h> <stdint.h> <sys/types.h>
            <stdlib.h> <stdio.h> <string.h> <strings.h> <inttypes.h>
            <limits.h> <unistd.h> <time.h> <ctype.h> <errno.h> <fcntl.h>
-           <sys/stat.h> <sys/time.h> <assert.h> <signal.h>
+           <sys/stat.h> <sys/time.h> <assert.h> <signal.h> <glib.h>
            "sysemu/os-posix.h, sysemu/os-win32.h "glib-compat.h"
            "qemu/typedefs.h"
             ))' "$f"