projects
/
pintos-anon
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Some suggestions from "Waqar Mohsin" <wmohsin@gmail.com>
[pintos-anon]
/
src
/
lib
/
kernel
/
list.h
diff --git
a/src/lib/kernel/list.h
b/src/lib/kernel/list.h
index e71c1cab31500c801547ec39131ee668fdd8c288..a041299f6701f02e9d840dc52dab9ab4077702d9 100644
(file)
--- a/
src/lib/kernel/list.h
+++ b/
src/lib/kernel/list.h
@@
-153,8
+153,6
@@
typedef bool list_less_func (const struct list_elem *a,
void *aux);
/* Operations on lists with ordered elements. */
void *aux);
/* Operations on lists with ordered elements. */
-void list_merge (struct list *, struct list *,
- list_less_func *, void *aux);
void list_sort (struct list *,
list_less_func *, void *aux);
void list_insert_ordered (struct list *, struct list_elem *,
void list_sort (struct list *,
list_less_func *, void *aux);
void list_insert_ordered (struct list *, struct list_elem *,