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.
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

View File

@ -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"/>