mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-08-24 06:48:18 -07:00
121 lines
3.2 KiB
Diff
121 lines
3.2 KiB
Diff
diff -Naur wmtimer-2.92.orig/wmgeneral/list.c wmtimer-2.92/wmgeneral/list.c
|
|
--- wmtimer-2.92.orig/wmgeneral/list.c 1999-12-23 16:01:39.000000000 +0100
|
|
+++ wmtimer-2.92/wmgeneral/list.c 2016-06-08 14:11:02.027179589 +0200
|
|
@@ -38,7 +38,7 @@
|
|
|
|
/* 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 @@
|
|
|
|
/* 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)
|
|
@@ -64,7 +64,7 @@
|
|
/* 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)
|
|
{
|
|
@@ -78,7 +78,7 @@
|
|
|
|
/* 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;
|
|
@@ -110,7 +110,7 @@
|
|
}
|
|
} */
|
|
|
|
-INLINE LinkedList * list_remove_elem (LinkedList * list, void *elem)
|
|
+LinkedList * list_remove_elem (LinkedList * list, void *elem)
|
|
{
|
|
LinkedList *tmp;
|
|
|
|
@@ -131,7 +131,7 @@
|
|
|
|
/* Return element that has ELEM as car */
|
|
|
|
-INLINE LinkedList * list_find (LinkedList * list, void *elem)
|
|
+LinkedList * list_find (LinkedList * list, void *elem)
|
|
{
|
|
while (list)
|
|
{
|
|
@@ -144,7 +144,7 @@
|
|
|
|
/* Free list (backwards recursive) */
|
|
|
|
-INLINE void list_free (LinkedList * list)
|
|
+void list_free (LinkedList * list)
|
|
{
|
|
if (list)
|
|
{
|
|
@@ -155,7 +155,7 @@
|
|
|
|
/* 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)
|
|
{
|
|
diff -Naur wmtimer-2.92.orig/wmgeneral/list.h wmtimer-2.92/wmgeneral/list.h
|
|
--- wmtimer-2.92.orig/wmgeneral/list.h 1999-12-23 16:01:39.000000000 +0100
|
|
+++ wmtimer-2.92/wmgeneral/list.h 2016-06-08 14:11:20.953198667 +0200
|
|
@@ -29,12 +29,6 @@
|
|
#ifndef __LIST_H_
|
|
#define __LIST_H_
|
|
|
|
-#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
|
|
-#define INLINE inline
|
|
-#else
|
|
-#define INLINE
|
|
-#endif
|
|
-
|
|
typedef struct LinkedList
|
|
{
|
|
void *head;
|
|
@@ -42,20 +36,20 @@
|
|
}
|
|
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
|