Merge conflicts resolved.

[redis.git] / src / adlist.h

diff --git a/src/adlist.h b/src/adlist.h
index a1209f62faaf8537ea752c250fe8c65f5c5b247c..36dba1ff32406616fb63f5ab8b59567ca6a26d84 100644 (file)
--- a/src/adlist.h
+++ b/src/adlist.h
@@ -50,7 +50,7 @@ typedef struct list {
     void *(*dup)(void *ptr);
     void (*free)(void *ptr);
     int (*match)(void *ptr, void *key);
-    unsigned int len;
+    unsigned long len;
 } list;
 
 /* Functions implemented as macros */
@@ -81,7 +81,7 @@ listNode *listNext(listIter *iter);
 void listReleaseIterator(listIter *iter);
 list *listDup(list *orig);
 listNode *listSearchKey(list *list, void *key);
-listNode *listIndex(list *list, int index);
+listNode *listIndex(list *list, long index);
 void listRewind(list *list, listIter *li);
 void listRewindTail(list *list, listIter *li);