[Pkg-wmaker-commits] [wmifs] 64/118: wmgeneral: Remove inline keywords.

[Doug Torrance]

This is an automated email from the git hooks/post-receive script.

dtorrance-guest pushed a commit to branch master
in repository wmifs.

commit 42d7344d32417de90db449a6e4f4355c61cf05cd
Author: Doug Torrance <dtorrance at monmouthcollege.edu>
Date:   Tue May 19 22:30:46 2015 -0500

    wmgeneral: Remove inline keywords.
    
    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
---
 wmgeneral/list.c | 18 +++++++++---------
 wmgeneral/list.h | 22 ++++++++--------------
 2 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/wmgeneral/list.c b/wmgeneral/list.c
index 2ff8208..d116b1f 100644
--- a/wmgeneral/list.c
+++ b/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/wmgeneral/list.h b/wmgeneral/list.h
index c624e76..4fae83a 100644
--- a/wmgeneral/list.h
+++ b/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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmifs.git