From 35fd2a8cc68c42d90756330535de04cbbb4d2613 Mon Sep 17 00:00:00 2001 From: Benjamin Franzke Date: Sat, 27 Nov 2010 19:04:11 +0100 Subject: [PATCH] wayland_client: rename wl_display_create to wl_display_connect Avoid conflict when using wayland-{server,client} together. --- clients/screenshot.c | 2 +- clients/window.c | 2 +- wayland/wayland-client.c | 2 +- wayland/wayland-client.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/clients/screenshot.c b/clients/screenshot.c index e9fa5aae..8b7dd8b1 100644 --- a/clients/screenshot.c +++ b/clients/screenshot.c @@ -54,7 +54,7 @@ int main(int argc, char *argv[]) GSource *source; struct wl_screenshooter *screenshooter; - display = wl_display_create(socket_name, sizeof socket_name); + display = wl_display_connect(socket_name, sizeof socket_name); if (display == NULL) { fprintf(stderr, "failed to create display: %m\n"); return -1; diff --git a/clients/window.c b/clients/window.c index ae558192..3860d1e4 100644 --- a/clients/window.c +++ b/clients/window.c @@ -1425,7 +1425,7 @@ display_create(int *argc, char **argv[], const GOptionEntry *option_entries) if (d == NULL) return NULL; - d->display = wl_display_create(socket_name, sizeof socket_name); + d->display = wl_display_connect(socket_name, sizeof socket_name); if (d->display == NULL) { fprintf(stderr, "failed to create display: %m\n"); return NULL; diff --git a/wayland/wayland-client.c b/wayland/wayland-client.c index 9c40d345..fddee714 100644 --- a/wayland/wayland-client.c +++ b/wayland/wayland-client.c @@ -329,7 +329,7 @@ static const struct wl_display_listener display_listener = { }; WL_EXPORT struct wl_display * -wl_display_create(const char *name, size_t name_size) +wl_display_connect(const char *name, size_t name_size) { struct wl_display *display; struct sockaddr_un addr; diff --git a/wayland/wayland-client.h b/wayland/wayland-client.h index 4fcb00b0..6ebf9acd 100644 --- a/wayland/wayland-client.h +++ b/wayland/wayland-client.h @@ -37,7 +37,7 @@ typedef int (*wl_display_update_func_t)(uint32_t mask, void *data); typedef void (*wl_display_sync_func_t)(void *data); typedef void (*wl_display_frame_func_t)(void *data, uint32_t time); -struct wl_display *wl_display_create(const char *name, size_t name_size); +struct wl_display *wl_display_connect(const char *name, size_t name_size); void wl_display_destroy(struct wl_display *display); int wl_display_get_fd(struct wl_display *display, wl_display_update_func_t update, void *data);