summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJasper St. Pierre <jstpierre@mecheye.net>2014-01-31 21:29:37 (GMT)
committerKristian Høgsberg <krh@bitplanet.net>2014-01-31 21:35:07 (GMT)
commitbab7f46d83fc7890202966dc62d61d95480d7709 (patch)
tree6d858a45c5fb8b550678f1a962a6e794ff77a0fe
parent338dbd76194fa58b4b443def006e986f64f10769 (diff)
downloadwayland-bab7f46d83fc7890202966dc62d61d95480d7709.tar.gz
wayland-bab7f46d83fc7890202966dc62d61d95480d7709.tar.xz
protocol: Fix build
"data" is the name of the void* argument in the implementation. While we probably shouldn't use such an easily-collidable name, just rename the callback's argument to callback_data for now.
-rw-r--r--protocol/wayland.xml7
1 files changed, 4 insertions, 3 deletions
diff --git a/protocol/wayland.xml b/protocol/wayland.xml
index 26e0d5c..bf6acd1 100644
--- a/protocol/wayland.xml
+++ b/protocol/wayland.xml
@@ -46,7 +46,7 @@
compositor after the callback is fired and as such the client must not
attempt to use it after that point.
- The data passed in the callback is the event serial.
+ The callback_data passed in the callback is the event serial.
</description>
<arg name="callback" type="new_id" interface="wl_callback"/>
</request>
@@ -172,7 +172,7 @@
<description summary="done event">
Notify the client when the related request is done.
</description>
- <arg name="data" type="uint" summary="request-specific data for the wl_callback"/>
+ <arg name="callback_data" type="uint" summary="request-specific data for the wl_callback"/>
</event>
</interface>
@@ -1079,7 +1079,8 @@
compositor after the callback is fired and as such the client must not
attempt to use it after that point.
- The data passed in the callback is the current time, in milliseconds.
+ The callback_data passed in the callback is the current time, in
+ milliseconds.
</description>
<arg name="callback" type="new_id" interface="wl_callback"/>