@@ -24,8 +24,6 @@ typedef struct DeviceListener DeviceListener;
typedef struct DeviceState DeviceState;
typedef struct DirtyBitmapSnapshot DirtyBitmapSnapshot;
typedef struct DisplayChangeListener DisplayChangeListener;
-typedef struct DisplayState DisplayState;
-typedef struct DisplaySurface DisplaySurface;
typedef struct DriveInfo DriveInfo;
typedef struct Error Error;
typedef struct EventNotifier EventNotifier;
@@ -131,7 +131,7 @@ struct PixelFormat {
uint8_t rbits, gbits, bbits, abits;
};
-struct DisplaySurface {
+typedef struct DisplaySurface {
pixman_format_code_t format;
pixman_image_t *image;
uint8_t flags;
@@ -140,7 +140,7 @@ struct DisplaySurface {
GLenum gltype;
GLuint texture;
#endif
-};
+} DisplaySurface;
typedef struct QemuUIInfo {
/* geometry */
@@ -189,6 +189,8 @@ typedef struct QemuDmaBuf {
bool y0_top;
} QemuDmaBuf;
+typedef struct DisplayState DisplayState;
+
typedef struct DisplayChangeListenerOps {
const char *dpy_name;
Files requiring DisplayState/DisplaySurface already include "ui/console.h". To clean "qemu/typedefs.h", move the declarations to "ui/console.h" (removing DisplaySurface forward declaration). Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> --- include/qemu/typedefs.h | 2 -- include/ui/console.h | 6 ++++-- 2 files changed, 4 insertions(+), 4 deletions(-)