From: "Philippe Mathieu-Daudé" <philmd@linaro.org>
To: qemu-devel@nongnu.org
Cc: qemu-block@nongnu.org, qemu-s390x@nongnu.org,
"Marc-Andre Lureau" <marcandre.lureau@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>
Subject: [PULL 04/10] ui/dbus: fix win32 compilation when !opengl
Date: Tue, 1 Aug 2023 23:54:15 +0200 [thread overview]
Message-ID: <20230801215421.60133-5-philmd@linaro.org> (raw)
In-Reply-To: <20230801215421.60133-1-philmd@linaro.org>
From: Marc-Andre Lureau <marcandre.lureau@redhat.com>
Fixes: https://gitlab.com/qemu-project/qemu/-/issues/1782
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20230725112540.53284-1-marcandre.lureau@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
ui/dbus-listener.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/ui/dbus-listener.c b/ui/dbus-listener.c
index 68ff343799..02fc6ae239 100644
--- a/ui/dbus-listener.c
+++ b/ui/dbus-listener.c
@@ -338,6 +338,7 @@ static bool dbus_scanout_map(DBusDisplayListener *ddl)
return true;
}
+#ifdef CONFIG_OPENGL
static bool
dbus_scanout_share_d3d_texture(
DBusDisplayListener *ddl,
@@ -399,7 +400,8 @@ dbus_scanout_share_d3d_texture(
return true;
}
-#endif
+#endif /* CONFIG_OPENGL */
+#endif /* WIN32 */
#ifdef CONFIG_OPENGL
static void dbus_scanout_texture(DisplayChangeListener *dcl,
--
2.38.1
next prev parent reply other threads:[~2023-08-01 21:56 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-01 21:54 [PULL 00/10] Misc fixes for 2023-08-01 Philippe Mathieu-Daudé
2023-08-01 21:54 ` [PULL 01/10] hw/xen: fix off-by-one in xen_evtchn_set_gsi() Philippe Mathieu-Daudé
2023-08-01 21:54 ` [PULL 02/10] i386/xen: consistent locking around Xen singleshot timers Philippe Mathieu-Daudé
2023-08-01 21:54 ` [PULL 03/10] hw/xen: prevent guest from binding loopback event channel to itself Philippe Mathieu-Daudé
2023-08-01 21:54 ` Philippe Mathieu-Daudé [this message]
2023-08-01 21:54 ` [PULL 05/10] ui/dbus: fix clang compilation issue Philippe Mathieu-Daudé
2023-08-01 21:54 ` [PULL 06/10] misc: Fix some typos in documentation and comments Philippe Mathieu-Daudé
2023-08-01 21:54 ` [PULL 07/10] tests/migration: Add -fno-stack-protector Philippe Mathieu-Daudé
2023-08-01 21:54 ` [PULL 08/10] target/nios2: Pass semihosting arg to exit Philippe Mathieu-Daudé
2023-08-01 21:54 ` [PULL 09/10] target/nios2: Fix semihost lseek offset computation Philippe Mathieu-Daudé
2023-08-01 21:54 ` [PULL 10/10] target/m68k: " Philippe Mathieu-Daudé
2023-08-02 15:14 ` [PULL 00/10] Misc fixes for 2023-08-01 Richard Henderson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230801215421.60133-5-philmd@linaro.org \
--to=philmd@linaro.org \
--cc=marcandre.lureau@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-s390x@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).