diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-06-12 13:50:01 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-06-12 13:50:02 +0100 |
| commit | 59c58f96b270f5edd4ad10954c3a96556cb3a728 (patch) | |
| tree | 005ac413277b8b88a2a580eab2d10d45f25d2fc8 /include/ui/spice-display.h | |
| parent | d3e3413bd6a8c0287dbad8942e208d562fd8e29e (diff) | |
| parent | 84995ea21935403cc9d57b6cb7dddcac5fa02c1c (diff) | |
Merge remote-tracking branch 'remotes/armbru/tags/pull-misc-2019-06-11-v3' into staging
Miscellaneous patches for 2019-06-11
# gpg: Signature made Wed 12 Jun 2019 12:20:41 BST
# gpg: using RSA key 354BC8B3D7EB2A6B68674E5F3870B400EB918653
# gpg: issuer "armbru@redhat.com"
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>" [full]
# gpg: aka "Markus Armbruster <armbru@pond.sub.org>" [full]
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867 4E5F 3870 B400 EB91 8653
* remotes/armbru/tags/pull-misc-2019-06-11-v3:
MAINTAINERS: Polish headline decorations
MAINTAINERS: Improve section headlines
MAINTAINERS: Remove duplicate entries of qemu-devel@nongnu.org
Clean up a header guard symbols (again)
Supply missing header guards
Clean up a few header guard symbols
scripts/clean-header-guards: Fix handling of trailing comments
Normalize position of header guard
Include qemu-common.h exactly where needed
Include qemu/module.h where needed, drop it from qemu-common.h
qemu-common: Move qemu_isalnum() etc. to qemu/ctype.h
qemu-common: Move tcg_enabled() etc. to sysemu/tcg.h
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/ui/spice-display.h')
| -rw-r--r-- | include/ui/spice-display.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/ui/spice-display.h b/include/ui/spice-display.h index 53c3612c32..eed60e4fae 100644 --- a/include/ui/spice-display.h +++ b/include/ui/spice-display.h @@ -15,6 +15,9 @@ * along with this program; if not, see <http://www.gnu.org/licenses/>. */ +#ifndef UI_SPICE_DISPLAY_H +#define UI_SPICE_DISPLAY_H + #include <spice/ipc_ring.h> #include <spice/enums.h> #include <spice/qxl_dev.h> @@ -183,3 +186,5 @@ int qemu_spice_display_is_running(SimpleSpiceDisplay *ssd); bool qemu_spice_fill_device_address(QemuConsole *con, char *device_address, size_t size); + +#endif |