From 8ee91794477c82171e0b165fb9e10655798682a0 Mon Sep 17 00:00:00 2001 From: Damien Lespiau Date: Tue, 30 Nov 2010 16:22:49 +0000 Subject: [PATCH] egl: Fix compilation with EGLX That what happens when you test things only with 2 configure options instead of 3. The 2 tested compile, the third one breaks. Another good catch for the eglx bot! --- clutter/egl/clutter-backend-egl.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/clutter/egl/clutter-backend-egl.c b/clutter/egl/clutter-backend-egl.c index 1466c2c..d9e74fa 100644 --- a/clutter/egl/clutter-backend-egl.c +++ b/clutter/egl/clutter-backend-egl.c @@ -520,6 +520,7 @@ clutter_backend_egl_redraw (ClutterBackend *backend, _clutter_stage_egl_redraw (CLUTTER_STAGE_EGL (impl), stage); } +#ifndef COGL_HAS_XLIB_SUPPORT static ClutterDeviceManager * clutter_backend_egl_get_device_manager (ClutterBackend *backend) { @@ -537,6 +538,7 @@ clutter_backend_egl_get_device_manager (ClutterBackend *backend) return backend_egl->device_manager; } +#endif static void clutter_backend_egl_init_events (ClutterBackend *backend) @@ -855,7 +857,9 @@ _clutter_backend_egl_class_init (ClutterBackendEGLClass *klass) backend_class->pre_parse = clutter_backend_egl_pre_parse; backend_class->post_parse = clutter_backend_egl_post_parse; backend_class->get_features = clutter_backend_egl_get_features; +#ifndef COGL_HAS_XLIB_SUPPORT backend_class->get_device_manager = clutter_backend_egl_get_device_manager; +#endif backend_class->init_events = clutter_backend_egl_init_events; backend_class->create_stage = clutter_backend_egl_create_stage; backend_class->create_context = clutter_backend_egl_create_context; -- 2.7.4