Changeset 95c675b in mainline for kernel/generic/include/gsort.h

Timestamp:

2017-10-17T13:11:35Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

60af4cdb

Parents:

dbf32b1 (diff), a416d070 (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

File:

• kernel/generic/include/gsort.h (moved) (moved from kernel/generic/include/sort.h ) (1 diff)

kernel/generic/include/gsort.h

@@ -33 +33 @@
  */
 
-#ifndef KERN_SORT_H_
-#define KERN_SORT_H_
+#ifndef KERN_GSORT_H_
+#define KERN_GSORT_H_
 
-#include <typedefs.h>
+#include <stdbool.h>
+#include <stddef.h>
 
 typedef int (* sort_cmp_t)(void *, void *, void *);
 
 extern bool gsort(void *, size_t, size_t, sort_cmp_t, void *);
-extern bool qsort(void *, size_t, size_t, sort_cmp_t, void *);
 
 #endif