From e16f4c8770b73f530dad842a31298963b6c7e41d Mon Sep 17 00:00:00 2001 From: Peter Maydell Date: Fri, 29 Jan 2016 17:49:51 +0000 Subject: [PATCH] ui: Clean up includes Clean up includes so that osdep.h is included first and headers which it implies are not included manually. This commit was created with scripts/clean-includes. Signed-off-by: Peter Maydell Message-id: 1454089805-5470-2-git-send-email-peter.maydell@linaro.org --- ui/console-gl.c | 1 + ui/console.c | 1 + ui/curses.c | 1 + ui/cursor.c | 1 + ui/egl-context.c | 1 + ui/egl-helpers.c | 9 +-------- ui/gtk-egl.c | 1 + ui/gtk-gl-area.c | 1 + ui/gtk.c | 1 + ui/input-keymap.c | 1 + ui/input-legacy.c | 2 +- ui/input.c | 1 + ui/keymaps.c | 1 + ui/qemu-pixman.c | 1 + ui/sdl.c | 1 + ui/sdl2-2d.c | 1 + ui/sdl2-gl.c | 1 + ui/sdl2-input.c | 1 + ui/sdl2.c | 1 + ui/sdl_zoom.c | 4 +--- ui/shader.c | 1 + ui/spice-core.c | 1 + ui/spice-display.c | 1 + ui/spice-input.c | 5 +---- ui/vnc-auth-sasl.c | 1 + ui/vnc-auth-vencrypt.c | 1 + ui/vnc-enc-hextile.c | 1 + ui/vnc-enc-tight.c | 3 +-- ui/vnc-enc-zlib.c | 1 + ui/vnc-enc-zrle-template.c | 2 +- ui/vnc-enc-zrle.c | 1 + ui/vnc-enc-zywrle-template.c | 1 + ui/vnc-jobs.c | 1 + ui/vnc-palette.c | 2 +- ui/vnc-ws.c | 1 + ui/vnc.c | 2 +- ui/x_keymap.c | 1 + 37 files changed, 37 insertions(+), 21 deletions(-) diff --git a/ui/console-gl.c b/ui/console-gl.c index baf397b300..74b1bed6ee 100644 --- a/ui/console-gl.c +++ b/ui/console-gl.c @@ -24,6 +24,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ +#include "qemu/osdep.h" #include "qemu-common.h" #include "ui/console.h" #include "ui/shader.h" diff --git a/ui/console.c b/ui/console.c index 791b4fcea2..b739ae9a05 100644 --- a/ui/console.c +++ b/ui/console.c @@ -21,6 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ +#include "qemu/osdep.h" #include "qemu-common.h" #include "ui/console.h" #include "hw/qdev-core.h" diff --git a/ui/curses.c b/ui/curses.c index 274e09b0be..b47558956c 100644 --- a/ui/curses.c +++ b/ui/curses.c @@ -21,6 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ +#include "qemu/osdep.h" #include #ifndef _WIN32 diff --git a/ui/cursor.c b/ui/cursor.c index 2b8dd3fa50..a276e01f1c 100644 --- a/ui/cursor.c +++ b/ui/cursor.c @@ -1,3 +1,4 @@ +#include "qemu/osdep.h" #include "qemu-common.h" #include "ui/console.h" diff --git a/ui/egl-context.c b/ui/egl-context.c index 40102e392e..3a02b68d1a 100644 --- a/ui/egl-context.c +++ b/ui/egl-context.c @@ -1,3 +1,4 @@ +#include "qemu/osdep.h" #include "qemu-common.h" #include "ui/egl-context.h" diff --git a/ui/egl-helpers.c b/ui/egl-helpers.c index 87d77afaa8..4c83834615 100644 --- a/ui/egl-helpers.c +++ b/ui/egl-helpers.c @@ -1,11 +1,4 @@ -#include -#include -#include -#include -#include -#include -#include -#include +#include "qemu/osdep.h" #include #include "ui/egl-helpers.h" diff --git a/ui/gtk-egl.c b/ui/gtk-egl.c index 500c42c9fa..431457c746 100644 --- a/ui/gtk-egl.c +++ b/ui/gtk-egl.c @@ -11,6 +11,7 @@ * See the COPYING file in the top-level directory. */ +#include "qemu/osdep.h" #include "qemu-common.h" #include "trace.h" diff --git a/ui/gtk-gl-area.c b/ui/gtk-gl-area.c index dec3edb296..b86ff3cbec 100644 --- a/ui/gtk-gl-area.c +++ b/ui/gtk-gl-area.c @@ -7,6 +7,7 @@ * See the COPYING file in the top-level directory. */ +#include "qemu/osdep.h" #include "qemu-common.h" #include "trace.h" diff --git a/ui/gtk.c b/ui/gtk.c index c8dbd5c7f0..2b46965f80 100644 --- a/ui/gtk.c +++ b/ui/gtk.c @@ -34,6 +34,7 @@ #define GETTEXT_PACKAGE "qemu" #define LOCALEDIR "po" +#include "qemu/osdep.h" #include "qemu-common.h" #include "ui/console.h" diff --git a/ui/input-keymap.c b/ui/input-keymap.c index 63d71d2632..fd2c09ddc2 100644 --- a/ui/input-keymap.c +++ b/ui/input-keymap.c @@ -1,3 +1,4 @@ +#include "qemu/osdep.h" #include "sysemu/sysemu.h" #include "ui/keymaps.h" #include "ui/input.h" diff --git a/ui/input-legacy.c b/ui/input-legacy.c index 3454055084..c97eac1778 100644 --- a/ui/input-legacy.c +++ b/ui/input-legacy.c @@ -22,9 +22,9 @@ * THE SOFTWARE. */ +#include "qemu/osdep.h" #include "sysemu/sysemu.h" #include "ui/console.h" -#include "qapi/error.h" #include "qmp-commands.h" #include "qapi-types.h" #include "ui/keymaps.h" diff --git a/ui/input.c b/ui/input.c index 006667b3d5..bdcb974a89 100644 --- a/ui/input.c +++ b/ui/input.c @@ -1,3 +1,4 @@ +#include "qemu/osdep.h" #include "hw/qdev.h" #include "sysemu/sysemu.h" #include "qapi-types.h" diff --git a/ui/keymaps.c b/ui/keymaps.c index 1b9ba3fa24..8899a0b31e 100644 --- a/ui/keymaps.c +++ b/ui/keymaps.c @@ -22,6 +22,7 @@ * THE SOFTWARE. */ +#include "qemu/osdep.h" #include "keymaps.h" #include "sysemu/sysemu.h" diff --git a/ui/qemu-pixman.c b/ui/qemu-pixman.c index 4116e1507b..c9f8dce7f4 100644 --- a/ui/qemu-pixman.c +++ b/ui/qemu-pixman.c @@ -3,6 +3,7 @@ * See the COPYING file in the top-level directory. */ +#include "qemu/osdep.h" #include "qemu-common.h" #include "ui/console.h" diff --git a/ui/sdl.c b/ui/sdl.c index f215fe140d..9804ee8dfb 100644 --- a/ui/sdl.c +++ b/ui/sdl.c @@ -25,6 +25,7 @@ /* Avoid compiler warning because macro is redefined in SDL_syswm.h. */ #undef WIN32_LEAN_AND_MEAN +#include "qemu/osdep.h" #include #include diff --git a/ui/sdl2-2d.c b/ui/sdl2-2d.c index 191ee3b52d..95930061ea 100644 --- a/ui/sdl2-2d.c +++ b/ui/sdl2-2d.c @@ -23,6 +23,7 @@ */ /* Ported SDL 1.2 code to 2.0 by Dave Airlie. */ +#include "qemu/osdep.h" #include "qemu-common.h" #include "ui/console.h" #include "ui/input.h" diff --git a/ui/sdl2-gl.c b/ui/sdl2-gl.c index 2bb3d06bab..a324ecacac 100644 --- a/ui/sdl2-gl.c +++ b/ui/sdl2-gl.c @@ -25,6 +25,7 @@ * THE SOFTWARE. */ +#include "qemu/osdep.h" #include "qemu-common.h" #include "ui/console.h" #include "ui/input.h" diff --git a/ui/sdl2-input.c b/ui/sdl2-input.c index ac5dc9476b..6e315ae800 100644 --- a/ui/sdl2-input.c +++ b/ui/sdl2-input.c @@ -23,6 +23,7 @@ */ /* Ported SDL 1.2 code to 2.0 by Dave Airlie. */ +#include "qemu/osdep.h" #include "qemu-common.h" #include "ui/console.h" #include "ui/input.h" diff --git a/ui/sdl2.c b/ui/sdl2.c index c0a76d7744..e0128ad755 100644 --- a/ui/sdl2.c +++ b/ui/sdl2.c @@ -23,6 +23,7 @@ */ /* Ported SDL 1.2 code to 2.0 by Dave Airlie. */ +#include "qemu/osdep.h" #include "qemu-common.h" #include "ui/console.h" #include "ui/input.h" diff --git a/ui/sdl_zoom.c b/ui/sdl_zoom.c index 2625c4557e..72622c2647 100644 --- a/ui/sdl_zoom.c +++ b/ui/sdl_zoom.c @@ -11,11 +11,9 @@ * */ -#include "sdl_zoom.h" #include "qemu/osdep.h" +#include "sdl_zoom.h" #include -#include -#include static void sdl_zoom_rgb16(SDL_Surface *src, SDL_Surface *dst, int smooth, SDL_Rect *dst_rect); diff --git a/ui/shader.c b/ui/shader.c index 0588655cfe..9264009b80 100644 --- a/ui/shader.c +++ b/ui/shader.c @@ -24,6 +24,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ +#include "qemu/osdep.h" #include "qemu-common.h" #include "ui/shader.h" diff --git a/ui/spice-core.c b/ui/spice-core.c index 8f27768819..4dbd99ab19 100644 --- a/ui/spice-core.c +++ b/ui/spice-core.c @@ -15,6 +15,7 @@ * along with this program; if not, see . */ +#include "qemu/osdep.h" #include #include diff --git a/ui/spice-display.c b/ui/spice-display.c index 0489131968..8a5b3258bd 100644 --- a/ui/spice-display.c +++ b/ui/spice-display.c @@ -15,6 +15,7 @@ * along with this program; if not, see . */ +#include "qemu/osdep.h" #include "qemu-common.h" #include "ui/qemu-spice.h" #include "qemu/timer.h" diff --git a/ui/spice-input.c b/ui/spice-input.c index 2b3b9ed714..72e406382f 100644 --- a/ui/spice-input.c +++ b/ui/spice-input.c @@ -15,10 +15,7 @@ * along with this program; if not, see . */ -#include -#include -#include -#include +#include "qemu/osdep.h" #include #include diff --git a/ui/vnc-auth-sasl.c b/ui/vnc-auth-sasl.c index de8abc96d4..13a59f500e 100644 --- a/ui/vnc-auth-sasl.c +++ b/ui/vnc-auth-sasl.c @@ -22,6 +22,7 @@ * THE SOFTWARE. */ +#include "qemu/osdep.h" #include "vnc.h" /* Max amount of data we send/recv for SASL steps to prevent DOS */ diff --git a/ui/vnc-auth-vencrypt.c b/ui/vnc-auth-vencrypt.c index 093dd2f4c2..8f3bb11cea 100644 --- a/ui/vnc-auth-vencrypt.c +++ b/ui/vnc-auth-vencrypt.c @@ -24,6 +24,7 @@ * THE SOFTWARE. */ +#include "qemu/osdep.h" #include "vnc.h" #include "qemu/main-loop.h" diff --git a/ui/vnc-enc-hextile.c b/ui/vnc-enc-hextile.c index 2e768fd899..4215bd7daf 100644 --- a/ui/vnc-enc-hextile.c +++ b/ui/vnc-enc-hextile.c @@ -24,6 +24,7 @@ * THE SOFTWARE. */ +#include "qemu/osdep.h" #include "vnc.h" static void hextile_enc_cord(uint8_t *ptr, int x, int y, int w, int h) diff --git a/ui/vnc-enc-tight.c b/ui/vnc-enc-tight.c index 9a9ddf2e3c..e5cba0e5a7 100644 --- a/ui/vnc-enc-tight.c +++ b/ui/vnc-enc-tight.c @@ -26,7 +26,7 @@ * THE SOFTWARE. */ -#include "config-host.h" +#include "qemu/osdep.h" /* This needs to be before jpeglib.h line because of conflict with INT32 definitions between jmorecfg.h (included by jpeglib.h) and @@ -40,7 +40,6 @@ #include #endif #ifdef CONFIG_VNC_JPEG -#include #include #endif diff --git a/ui/vnc-enc-zlib.c b/ui/vnc-enc-zlib.c index d1b97f2516..33e9df2f6a 100644 --- a/ui/vnc-enc-zlib.c +++ b/ui/vnc-enc-zlib.c @@ -24,6 +24,7 @@ * THE SOFTWARE. */ +#include "qemu/osdep.h" #include "vnc.h" #define ZALLOC_ALIGNMENT 16 diff --git a/ui/vnc-enc-zrle-template.c b/ui/vnc-enc-zrle-template.c index 70ae624ee9..abf6b86e4e 100644 --- a/ui/vnc-enc-zrle-template.c +++ b/ui/vnc-enc-zrle-template.c @@ -22,7 +22,7 @@ */ -#include +#include "qemu/osdep.h" #undef ZRLE_ENDIAN_SUFFIX diff --git a/ui/vnc-enc-zrle.c b/ui/vnc-enc-zrle.c index ed3b48465d..5489870e70 100644 --- a/ui/vnc-enc-zrle.c +++ b/ui/vnc-enc-zrle.c @@ -26,6 +26,7 @@ * THE SOFTWARE. */ +#include "qemu/osdep.h" #include "vnc.h" #include "vnc-enc-zrle.h" diff --git a/ui/vnc-enc-zywrle-template.c b/ui/vnc-enc-zywrle-template.c index 561f7bfabb..b446380a7a 100644 --- a/ui/vnc-enc-zywrle-template.c +++ b/ui/vnc-enc-zywrle-template.c @@ -100,6 +100,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #endif #define ZYWRLE_QUANTIZE +#include "qemu/osdep.h" #include "vnc-enc-zywrle.h" #ifndef ZRLE_COMPACT_PIXEL diff --git a/ui/vnc-jobs.c b/ui/vnc-jobs.c index 546635aabe..98ca978b06 100644 --- a/ui/vnc-jobs.c +++ b/ui/vnc-jobs.c @@ -26,6 +26,7 @@ */ +#include "qemu/osdep.h" #include "vnc.h" #include "vnc-jobs.h" #include "qemu/sockets.h" diff --git a/ui/vnc-palette.c b/ui/vnc-palette.c index c130deee9d..3b89d1af25 100644 --- a/ui/vnc-palette.c +++ b/ui/vnc-palette.c @@ -26,9 +26,9 @@ * THE SOFTWARE. */ +#include "qemu/osdep.h" #include "vnc-palette.h" #include -#include static VncPaletteEntry *palette_find(const VncPalette *palette, uint32_t color, unsigned int hash) diff --git a/ui/vnc-ws.c b/ui/vnc-ws.c index 80182334ef..1d3ecc2330 100644 --- a/ui/vnc-ws.c +++ b/ui/vnc-ws.c @@ -18,6 +18,7 @@ * along with this software; if not, see . */ +#include "qemu/osdep.h" #include "vnc.h" #include "io/channel-websock.h" diff --git a/ui/vnc.c b/ui/vnc.c index 339f8c35b2..b6bbea5f44 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -24,6 +24,7 @@ * THE SOFTWARE. */ +#include "qemu/osdep.h" #include "vnc.h" #include "vnc-jobs.h" #include "trace.h" @@ -37,7 +38,6 @@ #include "qapi/qmp/qerror.h" #include "qapi/qmp/types.h" #include "qmp-commands.h" -#include "qemu/osdep.h" #include "ui/input.h" #include "qapi-event.h" #include "crypto/hash.h" diff --git a/ui/x_keymap.c b/ui/x_keymap.c index 1a773174f6..27884851de 100644 --- a/ui/x_keymap.c +++ b/ui/x_keymap.c @@ -21,6 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ +#include "qemu/osdep.h" #include "qemu-common.h" #include "x_keymap.h"