Mesa (master): wayland-drm: Fix compilation with wayland master
Benjamin Franzke
bnf at kemper.freedesktop.org
Thu Sep 1 09:51:34 UTC 2011
Module: Mesa
Branch: master
Commit: 59884b9b5922ceb87e5d24acc36ffc70570a873d
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=59884b9b5922ceb87e5d24acc36ffc70570a873d
Author: Benjamin Franzke <benjaminfranzke at googlemail.com>
Date: Thu Sep 1 08:48:27 2011 +0200
wayland-drm: Fix compilation with wayland master
c661ecce introduced some not-yet-upstream stuff.
---
src/egl/wayland/wayland-drm/wayland-drm.c | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/egl/wayland/wayland-drm/wayland-drm.c b/src/egl/wayland/wayland-drm/wayland-drm.c
index 372faf7..443744c 100644
--- a/src/egl/wayland/wayland-drm/wayland-drm.c
+++ b/src/egl/wayland/wayland-drm/wayland-drm.c
@@ -95,9 +95,9 @@ drm_create_buffer(struct wl_client *client, struct wl_resource *resource,
case WL_DRM_FORMAT_XRGB32:
break;
default:
- wl_resource_post_error(resource,
- WL_DRM_ERROR_INVALID_FORMAT,
- "invalid format");
+ wl_client_post_error(client, &resource->object,
+ WL_DRM_ERROR_INVALID_FORMAT,
+ "invalid format");
return;
}
@@ -118,9 +118,9 @@ drm_create_buffer(struct wl_client *client, struct wl_resource *resource,
stride, format);
if (buffer->driver_buffer == NULL) {
- wl_resource_post_error(resource,
- WL_DRM_ERROR_INVALID_NAME,
- "invalid name");
+ wl_client_post_error(client, &resource->object,
+ WL_DRM_ERROR_INVALID_NAME,
+ "invalid name");
return;
}
@@ -143,9 +143,9 @@ drm_authenticate(struct wl_client *client,
struct wl_drm *drm = resource->data;
if (drm->callbacks->authenticate(drm->user_data, id) < 0)
- wl_resource_post_error(resource,
- WL_DRM_ERROR_AUTHENTICATE_FAIL,
- "authenicate failed");
+ wl_client_post_error(client, &resource->object,
+ WL_DRM_ERROR_AUTHENTICATE_FAIL,
+ "authenicate failed");
else
wl_resource_post_event(resource, WL_DRM_AUTHENTICATED);
}
More information about the mesa-commit
mailing list