Previously, if we attempted to build using C99 or later, we got "inline function declared but never defined" warnings and eventual "undefined reference" errors. As a result, it fails to build from source using gcc5.
However, if we move the definitions to list.h and add "extern inline" declarations to list.c, which does compile using C99 and later, then it no longer compiles using gnu90, the default for gcc4. To avoid this mess, we remove the inline keywords altogether. Note that this fixes Debian bugs for wmifs [1], wmppp.app [2], and wmtime [3]. [1] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=778170 [2] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=778172 [3] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=778174 --- wmckgmail/wmgeneral/list.c | 18 +++++++++--------- wmckgmail/wmgeneral/list.h | 22 ++++++++-------------- wmcpufreq/wmgeneral/list.c | 18 +++++++++--------- wmcpufreq/wmgeneral/list.h | 22 ++++++++-------------- wmifs/wmgeneral/list.c | 18 +++++++++--------- wmifs/wmgeneral/list.h | 22 ++++++++-------------- wmitime/wmgeneral/list.c | 18 +++++++++--------- wmitime/wmgeneral/list.h | 22 ++++++++-------------- wmkeys/wmgeneral/list.c | 18 +++++++++--------- wmkeys/wmgeneral/list.h | 22 ++++++++-------------- wmmon/wmgeneral/list.c | 18 +++++++++--------- wmmon/wmgeneral/list.h | 22 ++++++++-------------- wmppp.app/wmgeneral/list.c | 18 +++++++++--------- wmppp.app/wmgeneral/list.h | 22 ++++++++-------------- wmsm.app/wmgeneral/list.c | 18 +++++++++--------- wmsm.app/wmgeneral/list.h | 22 ++++++++-------------- wmtime/wmgeneral/list.c | 20 ++++++++++---------- wmtime/wmgeneral/list.h | 24 +++++++++--------------- wmtz/wmgeneral/list.c | 18 +++++++++--------- wmtz/wmgeneral/list.h | 22 ++++++++-------------- 20 files changed, 172 insertions(+), 232 deletions(-) mode change 100755 => 100644 wmcpufreq/wmgeneral/list.c mode change 100755 => 100644 wmcpufreq/wmgeneral/list.h diff --git a/wmckgmail/wmgeneral/list.c b/wmckgmail/wmgeneral/list.c index a63562f..0b69885 100644 --- a/wmckgmail/wmgeneral/list.c +++ b/wmckgmail/wmgeneral/list.c @@ -38,7 +38,7 @@ Boston, MA 02110-1301 USA. */ /* Return a cons cell produced from (head . tail) */ -INLINE LinkedList* +LinkedList* list_cons(void* head, LinkedList* tail) { LinkedList* cell; @@ -51,7 +51,7 @@ list_cons(void* head, LinkedList* tail) /* 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 @@ list_length(LinkedList* list) /* 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 @@ list_nth(int index, LinkedList* list) /* 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 @@ list_remove_head(LinkedList** list) /* Remove the element with `car' set to ELEMENT */ /* -INLINE void +void list_remove_elem(LinkedList** list, void* elem) { while (*list) @@ -112,7 +112,7 @@ list_remove_elem(LinkedList** list, void* elem) } }*/ -INLINE LinkedList * +LinkedList * list_remove_elem(LinkedList* list, void* elem) { LinkedList *tmp; @@ -132,7 +132,7 @@ list_remove_elem(LinkedList* list, void* elem) /* Return element that has ELEM as car */ -INLINE LinkedList* +LinkedList* list_find(LinkedList* list, void* elem) { while(list) @@ -146,7 +146,7 @@ list_find(LinkedList* list, void* elem) /* Free list (backwards recursive) */ -INLINE void +void list_free(LinkedList* list) { if(list) @@ -158,7 +158,7 @@ list_free(LinkedList* list) /* Map FUNCTION over all elements in LIST */ -INLINE void +void list_mapcar(LinkedList* list, void(*function)(void*)) { while(list) diff --git a/wmckgmail/wmgeneral/list.h b/wmckgmail/wmgeneral/list.h index 92c3454..3d6bad5 100644 --- a/wmckgmail/wmgeneral/list.h +++ b/wmckgmail/wmgeneral/list.h @@ -29,31 +29,25 @@ Boston, MA 02110-1301 USA. */ #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 diff --git a/wmcpufreq/wmgeneral/list.c b/wmcpufreq/wmgeneral/list.c old mode 100755 new mode 100644 index f804b2c..0104c94 --- a/wmcpufreq/wmgeneral/list.c +++ b/wmcpufreq/wmgeneral/list.c @@ -38,7 +38,7 @@ Boston, MA 02111-1307, USA. */ /* Return a cons cell produced from (head . tail) */ -INLINE LinkedList* +LinkedList* list_cons(void* head, LinkedList* tail) { LinkedList* cell; @@ -51,7 +51,7 @@ list_cons(void* head, LinkedList* tail) /* 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 @@ list_length(LinkedList* list) /* 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 @@ list_nth(int index, LinkedList* list) /* 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 @@ list_remove_head(LinkedList** list) /* Remove the element with `car' set to ELEMENT */ /* -INLINE void +void list_remove_elem(LinkedList** list, void* elem) { while (*list) @@ -112,7 +112,7 @@ list_remove_elem(LinkedList** list, void* elem) } }*/ -INLINE LinkedList * +LinkedList * list_remove_elem(LinkedList* list, void* elem) { LinkedList *tmp; @@ -132,7 +132,7 @@ list_remove_elem(LinkedList* list, void* elem) /* Return element that has ELEM as car */ -INLINE LinkedList* +LinkedList* list_find(LinkedList* list, void* elem) { while(list) @@ -146,7 +146,7 @@ list_find(LinkedList* list, void* elem) /* Free list (backwards recursive) */ -INLINE void +void list_free(LinkedList* list) { if(list) @@ -158,7 +158,7 @@ list_free(LinkedList* list) /* Map FUNCTION over all elements in LIST */ -INLINE void +void list_mapcar(LinkedList* list, void(*function)(void*)) { while(list) diff --git a/wmcpufreq/wmgeneral/list.h b/wmcpufreq/wmgeneral/list.h old mode 100755 new mode 100644 index af0f22c..43a42c3 --- a/wmcpufreq/wmgeneral/list.h +++ b/wmcpufreq/wmgeneral/list.h @@ -29,31 +29,25 @@ Boston, MA 02111-1307, USA. */ #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 diff --git a/wmifs/wmgeneral/list.c b/wmifs/wmgeneral/list.c index 2ff8208..d116b1f 100644 --- a/wmifs/wmgeneral/list.c +++ b/wmifs/wmgeneral/list.c @@ -38,7 +38,7 @@ Boston, MA 02110-1301 USA. */ /* Return a cons cell produced from (head . tail) */ -INLINE LinkedList *list_cons(void *head, LinkedList *tail) +LinkedList *list_cons(void *head, LinkedList *tail) { LinkedList *cell; @@ -50,7 +50,7 @@ INLINE LinkedList *list_cons(void *head, LinkedList *tail) /* Return the length of a list, list_length(NULL) returns zero */ -INLINE int list_length(LinkedList *list) +int list_length(LinkedList *list) { int i = 0; while (list) { @@ -63,7 +63,7 @@ INLINE int list_length(LinkedList *list) /* Return the Nth element of LIST, where N count from zero. If N larger than the list length, NULL is returned */ -INLINE void *list_nth(int index, LinkedList *list) +void *list_nth(int index, LinkedList *list) { while (index-- != 0) { if (list->tail) @@ -76,7 +76,7 @@ INLINE void *list_nth(int index, LinkedList *list) /* Remove the element at the head by replacing it by its successor */ -INLINE void list_remove_head(LinkedList **list) +void list_remove_head(LinkedList **list) { if (!*list) return; @@ -93,7 +93,7 @@ INLINE void list_remove_head(LinkedList **list) /* Remove the element with `car' set to ELEMENT */ /* - INLINE void + void list_remove_elem(LinkedList** list, void* elem) { while (*list) @@ -104,7 +104,7 @@ INLINE void list_remove_head(LinkedList **list) } }*/ -INLINE LinkedList *list_remove_elem(LinkedList *list, void *elem) +LinkedList *list_remove_elem(LinkedList *list, void *elem) { LinkedList *tmp; @@ -123,7 +123,7 @@ INLINE LinkedList *list_remove_elem(LinkedList *list, void *elem) /* Return element that has ELEM as car */ -INLINE LinkedList *list_find(LinkedList *list, void *elem) +LinkedList *list_find(LinkedList *list, void *elem) { while (list) { if (list->head == elem) @@ -135,7 +135,7 @@ INLINE LinkedList *list_find(LinkedList *list, void *elem) /* Free list (backwards recursive) */ -INLINE void list_free(LinkedList *list) +void list_free(LinkedList *list) { if (list) { list_free(list->tail); @@ -145,7 +145,7 @@ INLINE void list_free(LinkedList *list) /* Map FUNCTION over all elements in LIST */ -INLINE void list_mapcar(LinkedList *list, void(*function)(void *)) +void list_mapcar(LinkedList *list, void(*function)(void *)) { while (list) { (*function)(list->head); diff --git a/wmifs/wmgeneral/list.h b/wmifs/wmgeneral/list.h index c624e76..4fae83a 100644 --- a/wmifs/wmgeneral/list.h +++ b/wmifs/wmgeneral/list.h @@ -29,31 +29,25 @@ Boston, MA 02110-1301 USA. */ #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 diff --git a/wmitime/wmgeneral/list.c b/wmitime/wmgeneral/list.c index a63562f..0b69885 100644 --- a/wmitime/wmgeneral/list.c +++ b/wmitime/wmgeneral/list.c @@ -38,7 +38,7 @@ Boston, MA 02110-1301 USA. */ /* Return a cons cell produced from (head . tail) */ -INLINE LinkedList* +LinkedList* list_cons(void* head, LinkedList* tail) { LinkedList* cell; @@ -51,7 +51,7 @@ list_cons(void* head, LinkedList* tail) /* 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 @@ list_length(LinkedList* list) /* 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 @@ list_nth(int index, LinkedList* list) /* 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 @@ list_remove_head(LinkedList** list) /* Remove the element with `car' set to ELEMENT */ /* -INLINE void +void list_remove_elem(LinkedList** list, void* elem) { while (*list) @@ -112,7 +112,7 @@ list_remove_elem(LinkedList** list, void* elem) } }*/ -INLINE LinkedList * +LinkedList * list_remove_elem(LinkedList* list, void* elem) { LinkedList *tmp; @@ -132,7 +132,7 @@ list_remove_elem(LinkedList* list, void* elem) /* Return element that has ELEM as car */ -INLINE LinkedList* +LinkedList* list_find(LinkedList* list, void* elem) { while(list) @@ -146,7 +146,7 @@ list_find(LinkedList* list, void* elem) /* Free list (backwards recursive) */ -INLINE void +void list_free(LinkedList* list) { if(list) @@ -158,7 +158,7 @@ list_free(LinkedList* list) /* Map FUNCTION over all elements in LIST */ -INLINE void +void list_mapcar(LinkedList* list, void(*function)(void*)) { while(list) diff --git a/wmitime/wmgeneral/list.h b/wmitime/wmgeneral/list.h index 92c3454..3d6bad5 100644 --- a/wmitime/wmgeneral/list.h +++ b/wmitime/wmgeneral/list.h @@ -29,31 +29,25 @@ Boston, MA 02110-1301 USA. */ #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 diff --git a/wmkeys/wmgeneral/list.c b/wmkeys/wmgeneral/list.c index a63562f..0b69885 100644 --- a/wmkeys/wmgeneral/list.c +++ b/wmkeys/wmgeneral/list.c @@ -38,7 +38,7 @@ Boston, MA 02110-1301 USA. */ /* Return a cons cell produced from (head . tail) */ -INLINE LinkedList* +LinkedList* list_cons(void* head, LinkedList* tail) { LinkedList* cell; @@ -51,7 +51,7 @@ list_cons(void* head, LinkedList* tail) /* 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 @@ list_length(LinkedList* list) /* 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 @@ list_nth(int index, LinkedList* list) /* 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 @@ list_remove_head(LinkedList** list) /* Remove the element with `car' set to ELEMENT */ /* -INLINE void +void list_remove_elem(LinkedList** list, void* elem) { while (*list) @@ -112,7 +112,7 @@ list_remove_elem(LinkedList** list, void* elem) } }*/ -INLINE LinkedList * +LinkedList * list_remove_elem(LinkedList* list, void* elem) { LinkedList *tmp; @@ -132,7 +132,7 @@ list_remove_elem(LinkedList* list, void* elem) /* Return element that has ELEM as car */ -INLINE LinkedList* +LinkedList* list_find(LinkedList* list, void* elem) { while(list) @@ -146,7 +146,7 @@ list_find(LinkedList* list, void* elem) /* Free list (backwards recursive) */ -INLINE void +void list_free(LinkedList* list) { if(list) @@ -158,7 +158,7 @@ list_free(LinkedList* list) /* Map FUNCTION over all elements in LIST */ -INLINE void +void list_mapcar(LinkedList* list, void(*function)(void*)) { while(list) diff --git a/wmkeys/wmgeneral/list.h b/wmkeys/wmgeneral/list.h index 92c3454..3d6bad5 100644 --- a/wmkeys/wmgeneral/list.h +++ b/wmkeys/wmgeneral/list.h @@ -29,31 +29,25 @@ Boston, MA 02110-1301 USA. */ #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 diff --git a/wmmon/wmgeneral/list.c b/wmmon/wmgeneral/list.c index a63562f..0b69885 100644 --- a/wmmon/wmgeneral/list.c +++ b/wmmon/wmgeneral/list.c @@ -38,7 +38,7 @@ Boston, MA 02110-1301 USA. */ /* Return a cons cell produced from (head . tail) */ -INLINE LinkedList* +LinkedList* list_cons(void* head, LinkedList* tail) { LinkedList* cell; @@ -51,7 +51,7 @@ list_cons(void* head, LinkedList* tail) /* 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 @@ list_length(LinkedList* list) /* 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 @@ list_nth(int index, LinkedList* list) /* 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 @@ list_remove_head(LinkedList** list) /* Remove the element with `car' set to ELEMENT */ /* -INLINE void +void list_remove_elem(LinkedList** list, void* elem) { while (*list) @@ -112,7 +112,7 @@ list_remove_elem(LinkedList** list, void* elem) } }*/ -INLINE LinkedList * +LinkedList * list_remove_elem(LinkedList* list, void* elem) { LinkedList *tmp; @@ -132,7 +132,7 @@ list_remove_elem(LinkedList* list, void* elem) /* Return element that has ELEM as car */ -INLINE LinkedList* +LinkedList* list_find(LinkedList* list, void* elem) { while(list) @@ -146,7 +146,7 @@ list_find(LinkedList* list, void* elem) /* Free list (backwards recursive) */ -INLINE void +void list_free(LinkedList* list) { if(list) @@ -158,7 +158,7 @@ list_free(LinkedList* list) /* Map FUNCTION over all elements in LIST */ -INLINE void +void list_mapcar(LinkedList* list, void(*function)(void*)) { while(list) diff --git a/wmmon/wmgeneral/list.h b/wmmon/wmgeneral/list.h index 92c3454..3d6bad5 100644 --- a/wmmon/wmgeneral/list.h +++ b/wmmon/wmgeneral/list.h @@ -29,31 +29,25 @@ Boston, MA 02110-1301 USA. */ #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 diff --git a/wmppp.app/wmgeneral/list.c b/wmppp.app/wmgeneral/list.c index a63562f..0b69885 100644 --- a/wmppp.app/wmgeneral/list.c +++ b/wmppp.app/wmgeneral/list.c @@ -38,7 +38,7 @@ Boston, MA 02110-1301 USA. */ /* Return a cons cell produced from (head . tail) */ -INLINE LinkedList* +LinkedList* list_cons(void* head, LinkedList* tail) { LinkedList* cell; @@ -51,7 +51,7 @@ list_cons(void* head, LinkedList* tail) /* 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 @@ list_length(LinkedList* list) /* 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 @@ list_nth(int index, LinkedList* list) /* 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 @@ list_remove_head(LinkedList** list) /* Remove the element with `car' set to ELEMENT */ /* -INLINE void +void list_remove_elem(LinkedList** list, void* elem) { while (*list) @@ -112,7 +112,7 @@ list_remove_elem(LinkedList** list, void* elem) } }*/ -INLINE LinkedList * +LinkedList * list_remove_elem(LinkedList* list, void* elem) { LinkedList *tmp; @@ -132,7 +132,7 @@ list_remove_elem(LinkedList* list, void* elem) /* Return element that has ELEM as car */ -INLINE LinkedList* +LinkedList* list_find(LinkedList* list, void* elem) { while(list) @@ -146,7 +146,7 @@ list_find(LinkedList* list, void* elem) /* Free list (backwards recursive) */ -INLINE void +void list_free(LinkedList* list) { if(list) @@ -158,7 +158,7 @@ list_free(LinkedList* list) /* Map FUNCTION over all elements in LIST */ -INLINE void +void list_mapcar(LinkedList* list, void(*function)(void*)) { while(list) diff --git a/wmppp.app/wmgeneral/list.h b/wmppp.app/wmgeneral/list.h index 92c3454..3d6bad5 100644 --- a/wmppp.app/wmgeneral/list.h +++ b/wmppp.app/wmgeneral/list.h @@ -29,31 +29,25 @@ Boston, MA 02110-1301 USA. */ #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 diff --git a/wmsm.app/wmgeneral/list.c b/wmsm.app/wmgeneral/list.c index a63562f..0b69885 100644 --- a/wmsm.app/wmgeneral/list.c +++ b/wmsm.app/wmgeneral/list.c @@ -38,7 +38,7 @@ Boston, MA 02110-1301 USA. */ /* Return a cons cell produced from (head . tail) */ -INLINE LinkedList* +LinkedList* list_cons(void* head, LinkedList* tail) { LinkedList* cell; @@ -51,7 +51,7 @@ list_cons(void* head, LinkedList* tail) /* 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 @@ list_length(LinkedList* list) /* 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 @@ list_nth(int index, LinkedList* list) /* 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 @@ list_remove_head(LinkedList** list) /* Remove the element with `car' set to ELEMENT */ /* -INLINE void +void list_remove_elem(LinkedList** list, void* elem) { while (*list) @@ -112,7 +112,7 @@ list_remove_elem(LinkedList** list, void* elem) } }*/ -INLINE LinkedList * +LinkedList * list_remove_elem(LinkedList* list, void* elem) { LinkedList *tmp; @@ -132,7 +132,7 @@ list_remove_elem(LinkedList* list, void* elem) /* Return element that has ELEM as car */ -INLINE LinkedList* +LinkedList* list_find(LinkedList* list, void* elem) { while(list) @@ -146,7 +146,7 @@ list_find(LinkedList* list, void* elem) /* Free list (backwards recursive) */ -INLINE void +void list_free(LinkedList* list) { if(list) @@ -158,7 +158,7 @@ list_free(LinkedList* list) /* Map FUNCTION over all elements in LIST */ -INLINE void +void list_mapcar(LinkedList* list, void(*function)(void*)) { while(list) diff --git a/wmsm.app/wmgeneral/list.h b/wmsm.app/wmgeneral/list.h index 92c3454..3d6bad5 100644 --- a/wmsm.app/wmgeneral/list.h +++ b/wmsm.app/wmgeneral/list.h @@ -29,31 +29,25 @@ Boston, MA 02110-1301 USA. */ #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 diff --git a/wmtime/wmgeneral/list.c b/wmtime/wmgeneral/list.c index 8c4d6d2..0b69885 100644 --- a/wmtime/wmgeneral/list.c +++ b/wmtime/wmgeneral/list.c @@ -22,7 +22,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU CC; see the file COPYING. If not, write to the Free Software Foundation, 51 Franklin Street, Fifth Floor, -Boston, MA 02110-1301, USA. */ +Boston, MA 02110-1301 USA. */ /* As a special exception, if you link this library with files compiled with GCC to produce an executable, this does not cause the resulting executable @@ -38,7 +38,7 @@ Boston, MA 02110-1301, USA. */ /* Return a cons cell produced from (head . tail) */ -INLINE LinkedList* +LinkedList* list_cons(void* head, LinkedList* tail) { LinkedList* cell; @@ -51,7 +51,7 @@ list_cons(void* head, LinkedList* tail) /* 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 @@ list_length(LinkedList* list) /* 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 @@ list_nth(int index, LinkedList* list) /* 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 @@ list_remove_head(LinkedList** list) /* Remove the element with `car' set to ELEMENT */ /* -INLINE void +void list_remove_elem(LinkedList** list, void* elem) { while (*list) @@ -112,7 +112,7 @@ list_remove_elem(LinkedList** list, void* elem) } }*/ -INLINE LinkedList * +LinkedList * list_remove_elem(LinkedList* list, void* elem) { LinkedList *tmp; @@ -132,7 +132,7 @@ list_remove_elem(LinkedList* list, void* elem) /* Return element that has ELEM as car */ -INLINE LinkedList* +LinkedList* list_find(LinkedList* list, void* elem) { while(list) @@ -146,7 +146,7 @@ list_find(LinkedList* list, void* elem) /* Free list (backwards recursive) */ -INLINE void +void list_free(LinkedList* list) { if(list) @@ -158,7 +158,7 @@ list_free(LinkedList* list) /* Map FUNCTION over all elements in LIST */ -INLINE void +void list_mapcar(LinkedList* list, void(*function)(void*)) { while(list) diff --git a/wmtime/wmgeneral/list.h b/wmtime/wmgeneral/list.h index 95fc718..3d6bad5 100644 --- a/wmtime/wmgeneral/list.h +++ b/wmtime/wmgeneral/list.h @@ -18,7 +18,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU CC; see the file COPYING. If not, write to the Free Software Foundation, 51 Franklin Street, Fifth Floor, -Boston, MA 02110-1301, USA. */ +Boston, MA 02110-1301 USA. */ /* As a special exception, if you link this library with files compiled with GCC to produce an executable, this does not cause the resulting executable @@ -29,31 +29,25 @@ Boston, MA 02110-1301, USA. */ #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 diff --git a/wmtz/wmgeneral/list.c b/wmtz/wmgeneral/list.c index a63562f..0b69885 100644 --- a/wmtz/wmgeneral/list.c +++ b/wmtz/wmgeneral/list.c @@ -38,7 +38,7 @@ Boston, MA 02110-1301 USA. */ /* Return a cons cell produced from (head . tail) */ -INLINE LinkedList* +LinkedList* list_cons(void* head, LinkedList* tail) { LinkedList* cell; @@ -51,7 +51,7 @@ list_cons(void* head, LinkedList* tail) /* 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 @@ list_length(LinkedList* list) /* 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 @@ list_nth(int index, LinkedList* list) /* 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 @@ list_remove_head(LinkedList** list) /* Remove the element with `car' set to ELEMENT */ /* -INLINE void +void list_remove_elem(LinkedList** list, void* elem) { while (*list) @@ -112,7 +112,7 @@ list_remove_elem(LinkedList** list, void* elem) } }*/ -INLINE LinkedList * +LinkedList * list_remove_elem(LinkedList* list, void* elem) { LinkedList *tmp; @@ -132,7 +132,7 @@ list_remove_elem(LinkedList* list, void* elem) /* Return element that has ELEM as car */ -INLINE LinkedList* +LinkedList* list_find(LinkedList* list, void* elem) { while(list) @@ -146,7 +146,7 @@ list_find(LinkedList* list, void* elem) /* Free list (backwards recursive) */ -INLINE void +void list_free(LinkedList* list) { if(list) @@ -158,7 +158,7 @@ list_free(LinkedList* list) /* Map FUNCTION over all elements in LIST */ -INLINE void +void list_mapcar(LinkedList* list, void(*function)(void*)) { while(list) diff --git a/wmtz/wmgeneral/list.h b/wmtz/wmgeneral/list.h index 92c3454..3d6bad5 100644 --- a/wmtz/wmgeneral/list.h +++ b/wmtz/wmgeneral/list.h @@ -29,31 +29,25 @@ Boston, MA 02110-1301 USA. */ #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 -- 2.1.4 -- To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.
