[mutter/cherry-pick-e0944b60] backend: Don't pull generated headers (indirectly)
- From: Simon McVittie <smcv src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter/cherry-pick-e0944b60] backend: Don't pull generated headers (indirectly)
- Date: Thu, 12 Nov 2020 18:18:49 +0000 (UTC)
commit 965c94d46788188a3fe24e64056e39ad28469d18
Author: Carlos Garnacho <carlosg gnome org>
Date: Mon Oct 5 10:13:07 2020 +0000
backend: Don't pull generated headers (indirectly)
Use a typedef for MetaRemoteDesktop, so tests poking MetaBackend don't
indirectly depend upon generated headers. This is arguably a code fix
for a build system bug.
https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1470
Fixes: https://gitlab.gnome.org/GNOME/mutter/-/issues/1449
(or something...)
(cherry picked from commit e0944b6097566dee3a09a919ba49a071e0137f26)
src/backends/meta-backend-private.h | 4 ----
src/backends/meta-backend-types.h | 4 ++++
2 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/src/backends/meta-backend-private.h b/src/backends/meta-backend-private.h
index 6d7d3ad758..5f4981fda5 100644
--- a/src/backends/meta-backend-private.h
+++ b/src/backends/meta-backend-private.h
@@ -42,10 +42,6 @@
#include "backends/meta-settings-private.h"
#include "core/util-private.h"
-#ifdef HAVE_REMOTE_DESKTOP
-#include "backends/meta-remote-desktop.h"
-#endif
-
#define DEFAULT_XKB_RULES_FILE "evdev"
#define DEFAULT_XKB_MODEL "pc105+inet"
diff --git a/src/backends/meta-backend-types.h b/src/backends/meta-backend-types.h
index 4753c07440..146a8c3d7c 100644
--- a/src/backends/meta-backend-types.h
+++ b/src/backends/meta-backend-types.h
@@ -59,4 +59,8 @@ typedef struct _MetaScreenCastStream MetaScreenCastStream;
typedef struct _MetaWaylandCompositor MetaWaylandCompositor;
+#ifdef HAVE_REMOTE_DESKTOP
+typedef struct _MetaRemoteDesktop MetaRemoteDesktop;
+#endif
+
#endif /* META_BACKEND_TYPE_H */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]