summary refs log tree commit diff stats
path: root/scripts/clean-includes
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2016-03-22 20:27:55 +0000
committerPeter Maydell <peter.maydell@linaro.org>2016-03-22 20:27:55 +0000
commitffa6564c9b13cea4b704e184d29d721f2cb061bb (patch)
treeb60af1323f18e06bcd185cef87750bfbcb366741 /scripts/clean-includes
parent459621ac1a505ef7dee769295ee2e6c835b2314d (diff)
parentae6296342a1e0785cafd6ce2530f022d187e20e7 (diff)
downloadfocaccia-qemu-ffa6564c9b13cea4b704e184d29d721f2cb061bb.tar.gz
focaccia-qemu-ffa6564c9b13cea4b704e184d29d721f2cb061bb.zip
Merge remote-tracking branch 'remotes/weil/tags/pull-wxx-20160322' into staging
wxx patch queue

# gpg: Signature made Tue 22 Mar 2016 18:18:36 GMT using RSA key ID 677450AD
# gpg: Good signature from "Stefan Weil <sw@weilnetz.de>"
# gpg:                 aka "Stefan Weil <stefan.weil@weilnetz.de>"
# gpg:                 aka "Stefan Weil <stefan.weil@bib.uni-mannheim.de>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 4923 6FEA 75C9 5D69 8EC2  B78A E08C 21D5 6774 50AD

* remotes/weil/tags/pull-wxx-20160322:
  wxx: Add support for ncurses
  Remove unneeded include statements for setjmp.h
  Include setjmp.h in qemu/osdep.h (bug fix for w64)

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'scripts/clean-includes')
-rwxr-xr-xscripts/clean-includes2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/clean-includes b/scripts/clean-includes
index 177d253eb9..fb2a49c3b8 100755
--- a/scripts/clean-includes
+++ b/scripts/clean-includes
@@ -140,7 +140,7 @@ for f in "$@"; do
   perl -n -i -e 'print if !/\s*#\s*include\s*(["<][^>"]*[">])/ ||
                           ! (grep { $_ eq $1 } qw (
            "config-host.h" "qemu/compiler.h" "config.h"
-           <stdarg.h> <stddef.h> <stdbool.h> <stdint.h> <sys/types.h>
+           <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>