aboutsummaryrefslogtreecommitdiff
path: root/ui
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2013-01-21 12:03:47 +0000
committerStefan Hajnoczi <stefanha@redhat.com>2013-01-30 11:16:28 +0100
commit0b0878611c64f027ca5d15ba641f423cc04ead3f (patch)
treed6f33a13c5ec0033032fa1c8709f8a451825105f /ui
parent24a53049537886cf93273c01e3d7727444321afc (diff)
qemu-pixman.h: Avoid mutual inclusion loop with console.h
Remove an unnecessary mutual inclusion loop between qemu-pixman.h and console.h, since the former was only including the latter for 'PixelFormat*', which can be provided by typedefs.h. This requires a minor adjustment to the files which included qemu-pixman.h, since they were relying on it implicitly dragging in all of console.h. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Acked-by: Gerd Hoffmann <kraxel@redhat.com> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'ui')
-rw-r--r--ui/qemu-pixman.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/ui/qemu-pixman.c b/ui/qemu-pixman.c
index 609335ab11..6dcbe90546 100644
--- a/ui/qemu-pixman.c
+++ b/ui/qemu-pixman.c
@@ -3,7 +3,8 @@
* See the COPYING file in the top-level directory.
*/
-#include "ui/qemu-pixman.h"
+#include "qemu-common.h"
+#include "ui/console.h"
int qemu_pixman_get_type(int rshift, int gshift, int bshift)
{