mirrors/wayland
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/wayland.git synced 2025-10-29 05:40:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

protocol: Fix build

Browse source 
"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.
This commit is contained in:
Jasper St. Pierre 2014-01-31 16:29:37 -05:00 • committed by Kristian Høgsberg
parent 338dbd7619
commit bab7f46d83
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
protocol/wayland.xml
View file

@ -46,7 +46,7 @@
compositor after the callback is fired and as such the client must not compositor after the callback is fired and as such the client must not
attempt to use it after that point. 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> </description>
<arg name="callback" type="new_id" interface="wl_callback"/> <arg name="callback" type="new_id" interface="wl_callback"/>
</request> </request>
@ -172,7 +172,7 @@
<description summary="done event"> <description summary="done event">
Notify the client when the related request is done. Notify the client when the related request is done.
</description> </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> </event>
</interface> </interface>
@ -1079,7 +1079,8 @@
compositor after the callback is fired and as such the client must not compositor after the callback is fired and as such the client must not
attempt to use it after that point. 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> </description>
<arg name="callback" type="new_id" interface="wl_callback"/> <arg name="callback" type="new_id" interface="wl_callback"/>