diff options
author | Bernard Cafarelli <voyageur@gentoo.org> | 2016-01-04 13:27:39 +0100 |
---|---|---|
committer | Bernard Cafarelli <voyageur@gentoo.org> | 2016-01-04 13:56:48 +0100 |
commit | 6a6ce709cfce859fe40ea4d4cbe0d7f2c7e1365e (patch) | |
tree | 083fab7ea54dc7dea3cef5b087768931b2cea9b1 /x11-plugins/wmtop/files | |
parent | x11-plugins/wmpop3lb: fix compilation with gcc 5, bug #569234 (diff) | |
download | gentoo-6a6ce709cfce859fe40ea4d4cbe0d7f2c7e1365e.tar.gz gentoo-6a6ce709cfce859fe40ea4d4cbe0d7f2c7e1365e.tar.bz2 gentoo-6a6ce709cfce859fe40ea4d4cbe0d7f2c7e1365e.zip |
x11-plugins/wmtop: fix compilation with gcc 5, bug #569276
Package-Manager: portage-2.2.26
Diffstat (limited to 'x11-plugins/wmtop/files')
-rw-r--r-- | x11-plugins/wmtop/files/wmtop-0.9.0-list.patch | 127 |
1 files changed, 127 insertions, 0 deletions
diff --git a/x11-plugins/wmtop/files/wmtop-0.9.0-list.patch b/x11-plugins/wmtop/files/wmtop-0.9.0-list.patch new file mode 100644 index 000000000000..e6a77a3faf60 --- /dev/null +++ b/x11-plugins/wmtop/files/wmtop-0.9.0-list.patch @@ -0,0 +1,127 @@ +diff -Naur wmgeneral.orig/list.c wmgeneral/list.c +--- wmgeneral.orig/list.c 2016-01-04 13:25:53.717286654 +0100 ++++ wmgeneral/list.c 2016-01-04 13:26:06.948290980 +0100 +@@ -38,7 +38,7 @@ + + /* Return a cons cell produced from (head . tail) */ + +-INLINE LinkedList* ++LinkedList* + list_cons(void* head, LinkedList* tail) + { + LinkedList* cell; +@@ -51,7 +51,7 @@ + + /* Return the length of a list, list_length(NULL) returns zero */ + +-INLINE int ++int + list_length(LinkedList* list) + { + int i = 0; +@@ -66,7 +66,7 @@ + /* Return the Nth element of LIST, where N count from zero. If N + larger than the list length, NULL is returned */ + +-INLINE void* ++void* + list_nth(int index, LinkedList* list) + { + while(index-- != 0) +@@ -81,7 +81,7 @@ + + /* Remove the element at the head by replacing it by its successor */ + +-INLINE void ++void + list_remove_head(LinkedList** list) + { + if (!*list) return; +@@ -101,7 +101,7 @@ + + /* Remove the element with `car' set to ELEMENT */ + /* +-INLINE void ++void + list_remove_elem(LinkedList** list, void* elem) + { + while (*list) +@@ -112,7 +112,7 @@ + } + }*/ + +-INLINE LinkedList * ++LinkedList * + list_remove_elem(LinkedList* list, void* elem) + { + LinkedList *tmp; +@@ -132,7 +132,7 @@ + + /* Return element that has ELEM as car */ + +-INLINE LinkedList* ++LinkedList* + list_find(LinkedList* list, void* elem) + { + while(list) +@@ -146,7 +146,7 @@ + + /* Free list (backwards recursive) */ + +-INLINE void ++void + list_free(LinkedList* list) + { + if(list) +@@ -158,7 +158,7 @@ + + /* Map FUNCTION over all elements in LIST */ + +-INLINE void ++void + list_mapcar(LinkedList* list, void(*function)(void*)) + { + while(list) +diff -Naur wmgeneral.orig/list.h wmgeneral/list.h +--- wmgeneral.orig/list.h 2016-01-04 13:25:53.717286654 +0100 ++++ wmgeneral/list.h 2016-01-04 13:25:56.934287706 +0100 +@@ -29,31 +29,25 @@ + #ifndef __LIST_H_ + #define __LIST_H_ + +-#if defined(__GNUC__) && !defined(__STRICT_ANSI__) +-# define INLINE inline +-#else +-# define INLINE +-#endif +- + typedef struct LinkedList { + void *head; + struct LinkedList *tail; + } LinkedList; + +-INLINE LinkedList* list_cons(void* head, LinkedList* tail); ++LinkedList* list_cons(void* head, LinkedList* tail); + +-INLINE int list_length(LinkedList* list); ++int list_length(LinkedList* list); + +-INLINE void* list_nth(int index, LinkedList* list); ++void* list_nth(int index, LinkedList* list); + +-INLINE void list_remove_head(LinkedList** list); ++void list_remove_head(LinkedList** list); + +-INLINE LinkedList *list_remove_elem(LinkedList* list, void* elem); ++LinkedList *list_remove_elem(LinkedList* list, void* elem); + +-INLINE void list_mapcar(LinkedList* list, void(*function)(void*)); ++void list_mapcar(LinkedList* list, void(*function)(void*)); + +-INLINE LinkedList*list_find(LinkedList* list, void* elem); ++LinkedList*list_find(LinkedList* list, void* elem); + +-INLINE void list_free(LinkedList* list); ++void list_free(LinkedList* list); + + #endif |