Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-12-26 04:17:33 +00:00
Code Issues Releases Activity

wl: declare desktop/monitor info functions as weak symbols

Browse Source 
these are implemented on both Wayland and X11, as stubs on the former. we need
to properly dispatch these based on the backend, but for now this resolves the
conflict
This commit is contained in:
bi4k8 2022-11-28 19:23:23 +00:00 committed by Brenden Matthews
parent d11742ae18
commit 9ce6ffbb87
No known key found for this signature in database
GPG Key ID: B49ABB7270D9D4FD
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/wl.cc
View File

@ -63,7 +63,7 @@ priv::out_to_wayland_setting out_to_wayland;
static const char NOT_IN_WAYLAND[] = "Not running in Wayland";
void print_monitor(struct text_object *obj, char *p, unsigned int p_max_size) {
__attribute__((weak)) void print_monitor(struct text_object *obj, char *p, unsigned int p_max_size) {
(void)obj;
if (!out_to_wayland.get(*state)) {
@ -73,7 +73,7 @@ void print_monitor(struct text_object *obj, char *p, unsigned int p_max_size) {
snprintf(p, p_max_size, "%d", -1);
}
void print_monitor_number(struct text_object *obj, char *p,
__attribute__((weak)) void print_monitor_number(struct text_object *obj, char *p,
unsigned int p_max_size) {
(void)obj;
@ -84,7 +84,7 @@ void print_monitor_number(struct text_object *obj, char *p,
snprintf(p, p_max_size, "%d", -1);
}
void print_desktop(struct text_object *obj, char *p, unsigned int p_max_size) {
__attribute__((weak)) void print_desktop(struct text_object *obj, char *p, unsigned int p_max_size) {
(void)obj;
if (!out_to_wayland.get(*state)) {
@ -94,7 +94,7 @@ void print_desktop(struct text_object *obj, char *p, unsigned int p_max_size) {
snprintf(p, p_max_size, "%d", -1);
}
void print_desktop_number(struct text_object *obj, char *p,
__attribute__((weak)) void print_desktop_number(struct text_object *obj, char *p,
unsigned int p_max_size) {
(void)obj;
@ -105,7 +105,7 @@ void print_desktop_number(struct text_object *obj, char *p,
snprintf(p, p_max_size, "%d", -1);
}
void print_desktop_name(struct text_object *obj, char *p,
__attribute__((weak)) void print_desktop_name(struct text_object *obj, char *p,
unsigned int p_max_size) {
(void)obj;