notime

[16.git] / src / lib / ll.h

diff --git a/src/lib/ll.h b/src/lib/ll.h
index f653825ffce1f8b75a3a255ffd2647b2fb748325..159aa4ca9a1e84a9a0652086b1204db19d220aa5 100755 (executable)
--- a/src/lib/ll.h
+++ b/src/lib/ll.h
@@ -1,22 +1,38 @@
 #ifndef __LL_H__\r
 #define __LL_H__\r
 #include <stdio.h>\r
+#include <stdlib.h>\r
+#include <assert.h>\r
 #include "src/lib/16_tail.h"\r
 \r
+//#define OTHERMERGELISTSTIFF\r
+\r
+/* Link list node_t */\r
 typedef struct node\r
 {\r
        struct node     *prev;\r
        rgb_t   d;\r
-       int val;\r
+       int data;\r
        struct node     *next;\r
        word    id;\r
 } node_t;\r
 \r
+#ifdef OTHERMERGELISTSTIFF\r
+int listLength(node_t * item);\r
 void print_list(node_t * head);\r
 void pushe(node_t * head, int val);\r
 void pushs(node_t ** head, int val);\r
 int pop(node_t ** head);\r
 int remove_last(node_t * head);\r
 int remove_by_index(node_t ** head, int n);\r
+#else\r
+/* pull off the front node of the source and put it in dest */\r
+void Movenode(struct node** destRef, struct node** sourceRef);\r
+struct node* SortedMerge(struct node* a, struct node* b);\r
+struct node* LL_merge(struct node* a, struct node* b);\r
+void pushll(struct node** head_ref, int new_data);\r
+void printList(struct node *node);\r
+void removeDuplicates(struct node* head);\r
+#endif\r
 \r
 #endif\r