[Pkg-wmaker-commits] [wmtime] 61/101: 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 wmtime.

commit 925f0dd20f08a851d918bd8c8ebd5785bcd595cf
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 | 20 ++++++++++----------
 wmgeneral/list.h | 24 +++++++++---------------
 2 files changed, 19 insertions(+), 25 deletions(-)

diff --git a/wmgeneral/list.c b/wmgeneral/list.c
index 8c4d6d2..0b69885 100644
--- a/wmgeneral/list.c
+++ b/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/wmgeneral/list.h b/wmgeneral/list.h
index 95fc718..3d6bad5 100644
--- a/wmgeneral/list.h
+++ b/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

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