Skip to content

Commit a61765c

Browse files
CarterLiCarterLi
committed
Display (Linux): try fix building for old wayland version
1 parent 065b44f commit a61765c

File tree

3 files changed

+148
-148
lines changed

3 files changed

+148
-148
lines changed

‎src/detection/displayserver/linux/wayland/kde-output-device-v2-client-protocol.h‎

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -708,32 +708,32 @@ kde_output_device_v2_add_listener(struct kde_output_device_v2 *kde_output_device
708708
#define KDE_OUTPUT_DEVICE_V2_BRIGHTNESS_SINCE_VERSION 8
709709

710710

711-
/** @ingroup iface_kde_output_device_v2 */
712-
static inline void
713-
kde_output_device_v2_set_user_data(struct kde_output_device_v2 *kde_output_device_v2, void *user_data)
714-
{
715-
wl_proxy_set_user_data((struct wl_proxy *) kde_output_device_v2, user_data);
716-
}
711+
// /** @ingroup iface_kde_output_device_v2 */
712+
// static inline void
713+
// kde_output_device_v2_set_user_data(struct kde_output_device_v2 *kde_output_device_v2, void *user_data)
714+
// {
715+
// wl_proxy_set_user_data((struct wl_proxy *) kde_output_device_v2, user_data);
716+
// }
717717

718-
/** @ingroup iface_kde_output_device_v2 */
719-
static inline void *
720-
kde_output_device_v2_get_user_data(struct kde_output_device_v2 *kde_output_device_v2)
721-
{
722-
return wl_proxy_get_user_data((struct wl_proxy *) kde_output_device_v2);
723-
}
718+
// /** @ingroup iface_kde_output_device_v2 */
719+
// static inline void *
720+
// kde_output_device_v2_get_user_data(struct kde_output_device_v2 *kde_output_device_v2)
721+
// {
722+
// return wl_proxy_get_user_data((struct wl_proxy *) kde_output_device_v2);
723+
// }
724724

725-
static inline uint32_t
726-
kde_output_device_v2_get_version(struct kde_output_device_v2 *kde_output_device_v2)
727-
{
728-
return wl_proxy_get_version((struct wl_proxy *) kde_output_device_v2);
729-
}
725+
// static inline uint32_t
726+
// kde_output_device_v2_get_version(struct kde_output_device_v2 *kde_output_device_v2)
727+
// {
728+
// return wl_proxy_get_version((struct wl_proxy *) kde_output_device_v2);
729+
// }
730730

731-
/** @ingroup iface_kde_output_device_v2 */
732-
static inline void
733-
kde_output_device_v2_destroy(struct kde_output_device_v2 *kde_output_device_v2)
734-
{
735-
wl_proxy_destroy((struct wl_proxy *) kde_output_device_v2);
736-
}
731+
// /** @ingroup iface_kde_output_device_v2 */
732+
// static inline void
733+
// kde_output_device_v2_destroy(struct kde_output_device_v2 *kde_output_device_v2)
734+
// {
735+
// wl_proxy_destroy((struct wl_proxy *) kde_output_device_v2);
736+
// }
737737

738738
/**
739739
* @ingroup iface_kde_output_device_mode_v2
@@ -811,32 +811,32 @@ kde_output_device_mode_v2_add_listener(struct kde_output_device_mode_v2 *kde_out
811811
#define KDE_OUTPUT_DEVICE_MODE_V2_REMOVED_SINCE_VERSION 1
812812

813813

814-
/** @ingroup iface_kde_output_device_mode_v2 */
815-
static inline void
816-
kde_output_device_mode_v2_set_user_data(struct kde_output_device_mode_v2 *kde_output_device_mode_v2, void *user_data)
817-
{
818-
wl_proxy_set_user_data((struct wl_proxy *) kde_output_device_mode_v2, user_data);
819-
}
814+
// /** @ingroup iface_kde_output_device_mode_v2 */
815+
// static inline void
816+
// kde_output_device_mode_v2_set_user_data(struct kde_output_device_mode_v2 *kde_output_device_mode_v2, void *user_data)
817+
// {
818+
// wl_proxy_set_user_data((struct wl_proxy *) kde_output_device_mode_v2, user_data);
819+
// }
820820

821-
/** @ingroup iface_kde_output_device_mode_v2 */
822-
static inline void *
823-
kde_output_device_mode_v2_get_user_data(struct kde_output_device_mode_v2 *kde_output_device_mode_v2)
824-
{
825-
return wl_proxy_get_user_data((struct wl_proxy *) kde_output_device_mode_v2);
826-
}
821+
// /** @ingroup iface_kde_output_device_mode_v2 */
822+
// static inline void *
823+
// kde_output_device_mode_v2_get_user_data(struct kde_output_device_mode_v2 *kde_output_device_mode_v2)
824+
// {
825+
// return wl_proxy_get_user_data((struct wl_proxy *) kde_output_device_mode_v2);
826+
// }
827827

828-
static inline uint32_t
829-
kde_output_device_mode_v2_get_version(struct kde_output_device_mode_v2 *kde_output_device_mode_v2)
830-
{
831-
return wl_proxy_get_version((struct wl_proxy *) kde_output_device_mode_v2);
832-
}
828+
// static inline uint32_t
829+
// kde_output_device_mode_v2_get_version(struct kde_output_device_mode_v2 *kde_output_device_mode_v2)
830+
// {
831+
// return wl_proxy_get_version((struct wl_proxy *) kde_output_device_mode_v2);
832+
// }
833833

834-
/** @ingroup iface_kde_output_device_mode_v2 */
835-
static inline void
836-
kde_output_device_mode_v2_destroy(struct kde_output_device_mode_v2 *kde_output_device_mode_v2)
837-
{
838-
wl_proxy_destroy((struct wl_proxy *) kde_output_device_mode_v2);
839-
}
834+
// /** @ingroup iface_kde_output_device_mode_v2 */
835+
// static inline void
836+
// kde_output_device_mode_v2_destroy(struct kde_output_device_mode_v2 *kde_output_device_mode_v2)
837+
// {
838+
// wl_proxy_destroy((struct wl_proxy *) kde_output_device_mode_v2);
839+
// }
840840

841841
#ifdef __cplusplus
842842
}

‎src/detection/displayserver/linux/wayland/kde-output-order-v1-client-protocol.h‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -96,35 +96,35 @@ kde_output_order_v1_add_listener(struct kde_output_order_v1 *kde_output_order_v1
9696
*/
9797
#define KDE_OUTPUT_ORDER_V1_DESTROY_SINCE_VERSION 1
9898

99-
/** @ingroup iface_kde_output_order_v1 */
100-
static inline void
101-
kde_output_order_v1_set_user_data(struct kde_output_order_v1 *kde_output_order_v1, void *user_data)
102-
{
103-
wl_proxy_set_user_data((struct wl_proxy *) kde_output_order_v1, user_data);
104-
}
105-
106-
/** @ingroup iface_kde_output_order_v1 */
107-
static inline void *
108-
kde_output_order_v1_get_user_data(struct kde_output_order_v1 *kde_output_order_v1)
109-
{
110-
return wl_proxy_get_user_data((struct wl_proxy *) kde_output_order_v1);
111-
}
112-
113-
static inline uint32_t
114-
kde_output_order_v1_get_version(struct kde_output_order_v1 *kde_output_order_v1)
115-
{
116-
return wl_proxy_get_version((struct wl_proxy *) kde_output_order_v1);
117-
}
118-
119-
/**
120-
* @ingroup iface_kde_output_order_v1
121-
*/
122-
static inline void
123-
kde_output_order_v1_destroy(struct kde_output_order_v1 *kde_output_order_v1)
124-
{
125-
wl_proxy_marshal_flags((struct wl_proxy *) kde_output_order_v1,
126-
KDE_OUTPUT_ORDER_V1_DESTROY, NULL, wl_proxy_get_version((struct wl_proxy *) kde_output_order_v1), WL_MARSHAL_FLAG_DESTROY);
127-
}
99+
// /** @ingroup iface_kde_output_order_v1 */
100+
// static inline void
101+
// kde_output_order_v1_set_user_data(struct kde_output_order_v1 *kde_output_order_v1, void *user_data)
102+
// {
103+
// wl_proxy_set_user_data((struct wl_proxy *) kde_output_order_v1, user_data);
104+
// }
105+
106+
// /** @ingroup iface_kde_output_order_v1 */
107+
// static inline void *
108+
// kde_output_order_v1_get_user_data(struct kde_output_order_v1 *kde_output_order_v1)
109+
// {
110+
// return wl_proxy_get_user_data((struct wl_proxy *) kde_output_order_v1);
111+
// }
112+
113+
// static inline uint32_t
114+
// kde_output_order_v1_get_version(struct kde_output_order_v1 *kde_output_order_v1)
115+
// {
116+
// return wl_proxy_get_version((struct wl_proxy *) kde_output_order_v1);
117+
// }
118+
119+
// /**
120+
// * @ingroup iface_kde_output_order_v1
121+
// */
122+
// static inline void
123+
// kde_output_order_v1_destroy(struct kde_output_order_v1 *kde_output_order_v1)
124+
// {
125+
// wl_proxy_marshal_flags((struct wl_proxy *) kde_output_order_v1,
126+
// KDE_OUTPUT_ORDER_V1_DESTROY, NULL, wl_proxy_get_version((struct wl_proxy *) kde_output_order_v1), WL_MARSHAL_FLAG_DESTROY);
127+
// }
128128

129129
#ifdef __cplusplus
130130
}

‎src/detection/displayserver/linux/wayland/xdg-output-unstable-v1-client-protocol.h‎

Lines changed: 73 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -141,56 +141,56 @@ extern const struct wl_interface zxdg_output_v1_interface;
141141
*/
142142
#define ZXDG_OUTPUT_MANAGER_V1_GET_XDG_OUTPUT_SINCE_VERSION 1
143143

144-
/** @ingroup iface_zxdg_output_manager_v1 */
145-
static inline void
146-
zxdg_output_manager_v1_set_user_data(struct zxdg_output_manager_v1 *zxdg_output_manager_v1, void *user_data)
147-
{
148-
wl_proxy_set_user_data((struct wl_proxy *) zxdg_output_manager_v1, user_data);
149-
}
144+
// /** @ingroup iface_zxdg_output_manager_v1 */
145+
// static inline void
146+
// zxdg_output_manager_v1_set_user_data(struct zxdg_output_manager_v1 *zxdg_output_manager_v1, void *user_data)
147+
// {
148+
// wl_proxy_set_user_data((struct wl_proxy *) zxdg_output_manager_v1, user_data);
149+
// }
150150

151-
/** @ingroup iface_zxdg_output_manager_v1 */
152-
static inline void *
153-
zxdg_output_manager_v1_get_user_data(struct zxdg_output_manager_v1 *zxdg_output_manager_v1)
154-
{
155-
return wl_proxy_get_user_data((struct wl_proxy *) zxdg_output_manager_v1);
156-
}
151+
// /** @ingroup iface_zxdg_output_manager_v1 */
152+
// static inline void *
153+
// zxdg_output_manager_v1_get_user_data(struct zxdg_output_manager_v1 *zxdg_output_manager_v1)
154+
// {
155+
// return wl_proxy_get_user_data((struct wl_proxy *) zxdg_output_manager_v1);
156+
// }
157157

158-
static inline uint32_t
159-
zxdg_output_manager_v1_get_version(struct zxdg_output_manager_v1 *zxdg_output_manager_v1)
160-
{
161-
return wl_proxy_get_version((struct wl_proxy *) zxdg_output_manager_v1);
162-
}
158+
// static inline uint32_t
159+
// zxdg_output_manager_v1_get_version(struct zxdg_output_manager_v1 *zxdg_output_manager_v1)
160+
// {
161+
// return wl_proxy_get_version((struct wl_proxy *) zxdg_output_manager_v1);
162+
// }
163163

164-
/**
165-
* @ingroup iface_zxdg_output_manager_v1
166-
*
167-
* Using this request a client can tell the server that it is not
168-
* going to use the xdg_output_manager object anymore.
169-
*
170-
* Any objects already created through this instance are not affected.
171-
*/
172-
static inline void
173-
zxdg_output_manager_v1_destroy(struct zxdg_output_manager_v1 *zxdg_output_manager_v1)
174-
{
175-
wl_proxy_marshal_flags((struct wl_proxy *) zxdg_output_manager_v1,
176-
ZXDG_OUTPUT_MANAGER_V1_DESTROY, NULL, wl_proxy_get_version((struct wl_proxy *) zxdg_output_manager_v1), WL_MARSHAL_FLAG_DESTROY);
177-
}
164+
// /**
165+
// * @ingroup iface_zxdg_output_manager_v1
166+
// *
167+
// * Using this request a client can tell the server that it is not
168+
// * going to use the xdg_output_manager object anymore.
169+
// *
170+
// * Any objects already created through this instance are not affected.
171+
// */
172+
// static inline void
173+
// zxdg_output_manager_v1_destroy(struct zxdg_output_manager_v1 *zxdg_output_manager_v1)
174+
// {
175+
// wl_proxy_marshal_flags((struct wl_proxy *) zxdg_output_manager_v1,
176+
// ZXDG_OUTPUT_MANAGER_V1_DESTROY, NULL, wl_proxy_get_version((struct wl_proxy *) zxdg_output_manager_v1), WL_MARSHAL_FLAG_DESTROY);
177+
// }
178178

179-
/**
180-
* @ingroup iface_zxdg_output_manager_v1
181-
*
182-
* This creates a new xdg_output object for the given wl_output.
183-
*/
184-
static inline struct zxdg_output_v1 *
185-
zxdg_output_manager_v1_get_xdg_output(struct zxdg_output_manager_v1 *zxdg_output_manager_v1, struct wl_output *output)
186-
{
187-
struct wl_proxy *id;
179+
// /**
180+
// * @ingroup iface_zxdg_output_manager_v1
181+
// *
182+
// * This creates a new xdg_output object for the given wl_output.
183+
// */
184+
// static inline struct zxdg_output_v1 *
185+
// zxdg_output_manager_v1_get_xdg_output(struct zxdg_output_manager_v1 *zxdg_output_manager_v1, struct wl_output *output)
186+
// {
187+
// struct wl_proxy *id;
188188

189-
id = wl_proxy_marshal_flags((struct wl_proxy *) zxdg_output_manager_v1,
190-
ZXDG_OUTPUT_MANAGER_V1_GET_XDG_OUTPUT, &zxdg_output_v1_interface, wl_proxy_get_version((struct wl_proxy *) zxdg_output_manager_v1), 0, NULL, output);
189+
// id = wl_proxy_marshal_flags((struct wl_proxy *) zxdg_output_manager_v1,
190+
// ZXDG_OUTPUT_MANAGER_V1_GET_XDG_OUTPUT, &zxdg_output_v1_interface, wl_proxy_get_version((struct wl_proxy *) zxdg_output_manager_v1), 0, NULL, output);
191191

192-
return (struct zxdg_output_v1 *) id;
193-
}
192+
// return (struct zxdg_output_v1 *) id;
193+
// }
194194

195195
/**
196196
* @ingroup iface_zxdg_output_v1
@@ -374,38 +374,38 @@ zxdg_output_v1_add_listener(struct zxdg_output_v1 *zxdg_output_v1,
374374
*/
375375
#define ZXDG_OUTPUT_V1_DESTROY_SINCE_VERSION 1
376376

377-
/** @ingroup iface_zxdg_output_v1 */
378-
static inline void
379-
zxdg_output_v1_set_user_data(struct zxdg_output_v1 *zxdg_output_v1, void *user_data)
380-
{
381-
wl_proxy_set_user_data((struct wl_proxy *) zxdg_output_v1, user_data);
382-
}
377+
// /** @ingroup iface_zxdg_output_v1 */
378+
// static inline void
379+
// zxdg_output_v1_set_user_data(struct zxdg_output_v1 *zxdg_output_v1, void *user_data)
380+
// {
381+
// wl_proxy_set_user_data((struct wl_proxy *) zxdg_output_v1, user_data);
382+
// }
383383

384-
/** @ingroup iface_zxdg_output_v1 */
385-
static inline void *
386-
zxdg_output_v1_get_user_data(struct zxdg_output_v1 *zxdg_output_v1)
387-
{
388-
return wl_proxy_get_user_data((struct wl_proxy *) zxdg_output_v1);
389-
}
384+
// /** @ingroup iface_zxdg_output_v1 */
385+
// static inline void *
386+
// zxdg_output_v1_get_user_data(struct zxdg_output_v1 *zxdg_output_v1)
387+
// {
388+
// return wl_proxy_get_user_data((struct wl_proxy *) zxdg_output_v1);
389+
// }
390390

391-
static inline uint32_t
392-
zxdg_output_v1_get_version(struct zxdg_output_v1 *zxdg_output_v1)
393-
{
394-
return wl_proxy_get_version((struct wl_proxy *) zxdg_output_v1);
395-
}
391+
// static inline uint32_t
392+
// zxdg_output_v1_get_version(struct zxdg_output_v1 *zxdg_output_v1)
393+
// {
394+
// return wl_proxy_get_version((struct wl_proxy *) zxdg_output_v1);
395+
// }
396396

397-
/**
398-
* @ingroup iface_zxdg_output_v1
399-
*
400-
* Using this request a client can tell the server that it is not
401-
* going to use the xdg_output object anymore.
402-
*/
403-
static inline void
404-
zxdg_output_v1_destroy(struct zxdg_output_v1 *zxdg_output_v1)
405-
{
406-
wl_proxy_marshal_flags((struct wl_proxy *) zxdg_output_v1,
407-
ZXDG_OUTPUT_V1_DESTROY, NULL, wl_proxy_get_version((struct wl_proxy *) zxdg_output_v1), WL_MARSHAL_FLAG_DESTROY);
408-
}
397+
// /**
398+
// * @ingroup iface_zxdg_output_v1
399+
// *
400+
// * Using this request a client can tell the server that it is not
401+
// * going to use the xdg_output object anymore.
402+
// */
403+
// static inline void
404+
// zxdg_output_v1_destroy(struct zxdg_output_v1 *zxdg_output_v1)
405+
// {
406+
// wl_proxy_marshal_flags((struct wl_proxy *) zxdg_output_v1,
407+
// ZXDG_OUTPUT_V1_DESTROY, NULL, wl_proxy_get_version((struct wl_proxy *) zxdg_output_v1), WL_MARSHAL_FLAG_DESTROY);
408+
// }
409409

410410
#ifdef __cplusplus
411411
}

0 commit comments

Comments
 (0)