diff options
| author | Arnaud Fontaine <arfontaine@ITEM-58736.dhcp.oxfd.uk.sopra> | 2010-02-11 14:16:54 +0000 |
|---|---|---|
| committer | Arnaud Fontaine <arnau@debian.org> | 2010-08-09 16:06:30 -0500 |
| commit | 298fb95717053bad9568aa93f31bc25dfbc990ab (patch) | |
| tree | 563469a08dcd94b5de1666985dc9b85318b4671d | |
| parent | 338d470ee589bbcc3f822a404020241f7dc5cf55 (diff) | |
Rename time function parameter to xtime in to avoid clash with time.h
| -rw-r--r-- | ewmh/xcb_ewmh.h.m4 | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/ewmh/xcb_ewmh.h.m4 b/ewmh/xcb_ewmh.h.m4 index 34a6a7b..c1d8f09 100644 --- a/ewmh/xcb_ewmh.h.m4 +++ b/ewmh/xcb_ewmh.h.m4 @@ -2087,7 +2087,7 @@ xcb_ewmh_get_wm_handled_icons_reply(xcb_ewmh_connection_t *ewmh, xcb_void_cookie_t xcb_ewmh_set_wm_user_time(xcb_ewmh_connection_t *ewmh, xcb_window_t window, - uint32_t time); + uint32_t xtime); xcb_void_cookie_t xcb_ewmh_set_wm_user_time_checked(xcb_ewmh_connection_t *ewmh, xcb_window_t window, @@ -2100,24 +2100,24 @@ xcb_get_property_cookie_t xcb_ewmh_get_wm_user_time(xcb_ewmh_connection_t *ewmh, xcb_window_t window); static inline uint8_t -xcb_ewmh_get_wm_user_time_from_reply(uint32_t *time, +xcb_ewmh_get_wm_user_time_from_reply(uint32_t *xtime, xcb_get_property_reply_t *r) { - return xcb_ewmh_get_cardinal_from_reply(time, r); + return xcb_ewmh_get_cardinal_from_reply(xtime, r); } static inline uint8_t xcb_ewmh_get_wm_user_time_reply(xcb_ewmh_connection_t *ewmh, xcb_get_property_cookie_t cookie, - uint32_t *time, + uint32_t *xtime, xcb_generic_error_t **e) { - return xcb_ewmh_get_cardinal_reply(ewmh, cookie, time, e); + return xcb_ewmh_get_cardinal_reply(ewmh, cookie, xtime, e); } xcb_void_cookie_t xcb_ewmh_set_wm_user_time_window(xcb_ewmh_connection_t *ewmh, xcb_window_t window, - uint32_t time); + uint32_t xtime); xcb_void_cookie_t xcb_ewmh_set_wm_user_time_window_checked(xcb_ewmh_connection_t *ewmh, xcb_window_t window, @@ -2130,19 +2130,19 @@ xcb_get_property_cookie_t xcb_ewmh_get_wm_user_time_window(xcb_ewmh_connection_t xcb_window_t window); static inline uint8_t -xcb_ewmh_get_wm_user_time_window_from_reply(uint32_t *time, +xcb_ewmh_get_wm_user_time_window_from_reply(uint32_t *xtime, xcb_get_property_reply_t *r) { - return xcb_ewmh_get_cardinal_from_reply(time, r); + return xcb_ewmh_get_cardinal_from_reply(xtime, r); } static inline uint8_t xcb_ewmh_get_wm_user_time_window_reply(xcb_ewmh_connection_t *ewmh, xcb_get_property_cookie_t cookie, - uint32_t *time, + uint32_t *xtime, xcb_generic_error_t **e) { - return xcb_ewmh_get_cardinal_reply(ewmh, cookie, time, e); + return xcb_ewmh_get_cardinal_reply(ewmh, cookie, xtime, e); } xcb_void_cookie_t xcb_ewmh_set_frame_extents(xcb_ewmh_connection_t *ewmh, |