[PATCH] launcher-util: Fix building with EGL disabled
Armin K
krejzi at email.com
Wed Jul 31 09:38:44 PDT 2013
Don't declare weston_launcher_drm_set_master if EGL
(and thus DRM backend) are disabled.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=67561
---
src/launcher-util.c | 5 ++++-
src/launcher-util.h | 2 ++
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/launcher-util.c b/src/launcher-util.c
index 6f6ee11..c6e600d 100644
--- a/src/launcher-util.c
+++ b/src/launcher-util.c
@@ -33,7 +33,9 @@
#include <sys/uio.h>
#include <fcntl.h>
+#ifdef BUILD_DRM_COMPOSITOR
#include <xf86drm.h>
+#endif
#include "compositor.h"
#include "launcher-util.h"
@@ -105,6 +107,7 @@ weston_launcher_open(struct weston_compositor *compositor,
return data->fd;
}
+#ifdef BUILD_DRM_COMPOSITOR
int
weston_launcher_drm_set_master(struct weston_compositor *compositor,
int drm_fd, char master)
@@ -159,4 +162,4 @@ weston_launcher_drm_set_master(struct weston_compositor *compositor,
return ret;
}
-
+#endif
diff --git a/src/launcher-util.h b/src/launcher-util.h
index da11028..d1c2f39 100644
--- a/src/launcher-util.h
+++ b/src/launcher-util.h
@@ -28,8 +28,10 @@
int
weston_launcher_open(struct weston_compositor *compositor,
const char *path, int flags);
+#ifdef BUILD_DRM_COMPOSITOR
int
weston_launcher_drm_set_master(struct weston_compositor *compositor,
int drm_fd, char master);
+#endif
#endif
--
1.8.3.4
More information about the wayland-devel
mailing list