diff options
| author | Kristian Høgsberg <krh@bitplanet.net> | 2011-08-19 11:05:01 -0400 |
|---|---|---|
| committer | Kristian Høgsberg <krh@bitplanet.net> | 2011-08-27 12:06:11 -0400 |
| commit | 84c13ab8100c5f8d6fb3de1127abf7facab145ff (patch) | |
| tree | f4e34a18c5fea3b2a4befc95d71cac85057b13e3 | |
| parent | e8a192ca616107dcb672b34d0c80f2de679bcd0a (diff) | |
Rename global 'func' to 'bind'
| -rw-r--r-- | src/wayland-server.c | 10 | ||||
| -rw-r--r-- | src/wayland-server.h | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/wayland-server.c b/src/wayland-server.c index c3f30d6..421a407 100644 --- a/src/wayland-server.c +++ b/src/wayland-server.c @@ -81,7 +81,7 @@ struct wl_display { struct wl_global { struct wl_object *object; - wl_global_bind_func_t func; + wl_global_bind_func_t bind; struct wl_list link; }; @@ -547,8 +547,8 @@ display_bind(struct wl_client *client, wl_client_post_error(client, &client->display->resource.object, WL_DISPLAY_ERROR_INVALID_OBJECT, "invalid object %d", id); - else if (global->func) - global->func(client, global->object, version); + else if (global->bind) + global->bind(client, global->object, version); } static void @@ -652,7 +652,7 @@ wl_display_add_object(struct wl_display *display, struct wl_object *object) WL_EXPORT int wl_display_add_global(struct wl_display *display, - struct wl_object *object, wl_global_bind_func_t func) + struct wl_object *object, wl_global_bind_func_t bind) { struct wl_global *global; @@ -661,7 +661,7 @@ wl_display_add_global(struct wl_display *display, return -1; global->object = object; - global->func = func; + global->bind = bind; wl_list_insert(display->global_list.prev, &global->link); return 0; diff --git a/src/wayland-server.h b/src/wayland-server.h index e1a9b7a..2077a1c 100644 --- a/src/wayland-server.h +++ b/src/wayland-server.h @@ -91,7 +91,7 @@ typedef void (*wl_global_bind_func_t)(struct wl_client *client, int wl_display_add_global(struct wl_display *display, struct wl_object *object, - wl_global_bind_func_t func); + wl_global_bind_func_t bind); int wl_display_remove_global(struct wl_display *display, struct wl_object *object); |