diff options
| author | Carlos Garnacho <carlosg@gnome.org> | 2020-10-05 10:13:07 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2020-11-12 18:18:46 +0000 |
| commit | 965c94d46788188a3fe24e64056e39ad28469d18 (patch) | |
| tree | f3cab41b208cd1c1e9378e02b0843e61eb1fa0be | |
| parent | 067af969c03c31a2b7380b14f3344ef7d2258313 (diff) | |
| download | mutter-cherry-pick-e0944b60.tar.gz | |
backend: Don't pull generated headers (indirectly)cherry-pick-e0944b60
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)
| -rw-r--r-- | src/backends/meta-backend-private.h | 4 | ||||
| -rw-r--r-- | 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 6d7d3ad75..5f4981fda 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 4753c0744..146a8c3d7 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 */ |