Changeset ff381a7 in mainline for kernel/generic/include/adt/list.h

Timestamp:

2015-11-02T20:54:19Z (10 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

d8513177

Parents:

3feeab2 (diff), 5265eea4 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• kernel/generic/include/adt/list.h (modified) (3 diffs)

kernel/generic/include/adt/list.h

@@ -53 +53 @@
 
 
-extern int list_member(const link_t *, const list_t *);
+extern bool list_member(const link_t *, const list_t *);
 extern void list_splice(list_t *, link_t *);
-extern unsigned int list_count(const list_t *);
+extern unsigned long list_count(const list_t *);
 
 
@@ -220 +220 @@
  *
  */
-NO_TRACE static inline int list_empty(const list_t *list)
+NO_TRACE static inline bool list_empty(const list_t *list)
 {
         return (list->head.next == &list->head);
@@ -353 +353 @@
  *
  */
-static inline link_t *list_nth(list_t *list, unsigned int n)
-{
-        unsigned int cnt = 0;
+static inline link_t *list_nth(list_t *list, unsigned long n)
+{
+        unsigned long cnt = 0;
         link_t *link;