diff options
author | Drew DeVault <sir@cmpwn.com> | 2015-12-21 20:42:08 -0500 |
---|---|---|
committer | Drew DeVault <sir@cmpwn.com> | 2015-12-21 20:42:08 -0500 |
commit | 91c102a897467ff1bae345458ccf096e32e7bd15 (patch) | |
tree | 104c612d08afef1566c9b56f962641bb39c0dc1b /include | |
parent | Merge pull request #391 from mikkeloscar/trigger-workspace-ipc (diff) | |
parent | replace non-standard qsort_r with qsort (diff) | |
download | sway-91c102a897467ff1bae345458ccf096e32e7bd15.tar.gz sway-91c102a897467ff1bae345458ccf096e32e7bd15.tar.zst sway-91c102a897467ff1bae345458ccf096e32e7bd15.zip |
Merge pull request #393 from robotanarchy/musl-libc-compatibility
musl libc compatibility
Diffstat (limited to 'include')
-rw-r--r-- | include/config.h | 2 | ||||
-rw-r--r-- | include/list.h | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/include/config.h b/include/config.h index b97acb57..a915fbed 100644 --- a/include/config.h +++ b/include/config.h | |||
@@ -179,10 +179,12 @@ void free_output_config(struct output_config *oc); | |||
179 | int workspace_output_cmp_workspace(const void *a, const void *b); | 179 | int workspace_output_cmp_workspace(const void *a, const void *b); |
180 | 180 | ||
181 | int sway_binding_cmp(const void *a, const void *b); | 181 | int sway_binding_cmp(const void *a, const void *b); |
182 | int sway_binding_cmp_qsort(const void *a, const void *b); | ||
182 | int sway_binding_cmp_keys(const void *a, const void *b); | 183 | int sway_binding_cmp_keys(const void *a, const void *b); |
183 | void free_sway_binding(struct sway_binding *sb); | 184 | void free_sway_binding(struct sway_binding *sb); |
184 | 185 | ||
185 | int sway_mouse_binding_cmp(const void *a, const void *b); | 186 | int sway_mouse_binding_cmp(const void *a, const void *b); |
187 | int sway_mouse_binding_cmp_qsort(const void *a, const void *b); | ||
186 | int sway_mouse_binding_cmp_buttons(const void *a, const void *b); | 188 | int sway_mouse_binding_cmp_buttons(const void *a, const void *b); |
187 | void free_sway_mouse_binding(struct sway_mouse_binding *smb); | 189 | void free_sway_mouse_binding(struct sway_mouse_binding *smb); |
188 | 190 | ||
diff --git a/include/list.h b/include/list.h index 90d0ad36..d18d3f54 100644 --- a/include/list.h +++ b/include/list.h | |||
@@ -13,8 +13,9 @@ void list_add(list_t *list, void *item); | |||
13 | void list_insert(list_t *list, int index, void *item); | 13 | void list_insert(list_t *list, int index, void *item); |
14 | void list_del(list_t *list, int index); | 14 | void list_del(list_t *list, int index); |
15 | void list_cat(list_t *list, list_t *source); | 15 | void list_cat(list_t *list, list_t *source); |
16 | // See qsort | 16 | // See qsort. Remember to use *_qsort functions as compare functions, |
17 | void list_sort(list_t *list, int compare(const void *left, const void *right)); | 17 | // because they dereference the left and right arguments first! |
18 | void list_qsort(list_t *list, int compare(const void *left, const void *right)); | ||
18 | // Return index for first item in list that returns 0 for given compare | 19 | // Return index for first item in list that returns 0 for given compare |
19 | // function or -1 if none matches. | 20 | // function or -1 if none matches. |
20 | int list_seq_find(list_t *list, int compare(const void *item, const void *cmp_to), const void *cmp_to); | 21 | int list_seq_find(list_t *list, int compare(const void *item, const void *cmp_to), const void *cmp_to); |