diff options
author | Anthony Liguori <aliguori@us.ibm.com> | 2012-12-10 08:35:15 -0600 |
---|---|---|
committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-12-10 08:35:15 -0600 |
commit | 1c97e303d4ea80a2691334b0febe87a50660f99d (patch) | |
tree | 6b84e52608c62dcb8a8ffc5e5a6ccc94d83c0c93 /ui | |
parent | 7c12fd9b29c6ca2119396f143d84706f2fba6222 (diff) | |
parent | b34d12d153e6e5c5e5e00eac510b054a94409deb (diff) |
Merge remote-tracking branch 'afaerber/qom-cpu' into staging
* afaerber/qom-cpu:
target-i386: Postpone cpuid_level update to realize time
target-i386: Use define for cpuid vendor string size
target-i386: Separate feature string parsing from CPU model lookup
target-i386/cpu.c: Coding style fixes
qdev: qdev_create(): use error_report() instead of hw_error()
sysemu.h: Include qemu-types.h instead of qemu-common.h
Create qemu-types.h for struct typedefs
qlist.h: Do not include qemu-common.h
qga/channel-posix.c: Include headers it needs
qapi/qmp-registry.c: Include headers it needs
ui/vnc-palette.c: Include headers it needs
user: Rename qemu-types.h to qemu-user-types.h
user: Move *-user/qemu-types.h to main directory
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'ui')
-rw-r--r-- | ui/vnc-palette.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ui/vnc-palette.c b/ui/vnc-palette.c index 63d5f64917..c130deee9d 100644 --- a/ui/vnc-palette.c +++ b/ui/vnc-palette.c @@ -27,6 +27,8 @@ */ #include "vnc-palette.h" +#include <glib.h> +#include <string.h> static VncPaletteEntry *palette_find(const VncPalette *palette, uint32_t color, unsigned int hash) |