X-Git-Url: http://www.aleph1.co.uk/gitweb/?a=blobdiff_plain;f=direct%2Fydirectenv.h;h=ceaa6c8423e1a4fad573c5215815d9a31817ea0f;hb=7620f7d1207e72dc6b3c58bc452000b9ec82b57b;hp=824ce20ed2b232a9dd99832b0704a93e766453de;hpb=7396445d7d0d13469b9505791114b9dc6b76ffe4;p=yaffs2.git

diff --git a/direct/ydirectenv.h b/direct/ydirectenv.h
index 824ce20..ceaa6c8 100644
--- a/direct/ydirectenv.h
+++ b/direct/ydirectenv.h
@@ -25,7 +25,8 @@
 #include "stdlib.h"
 #include "stdio.h"
 #include "string.h"
-#include "yaffs_malloc.h"
+#include "yaffs_osglue.h"
+#include "yaffs_hweight.h"
 
 #include "assert.h"
 #define YBUG() assert(0)
@@ -43,6 +44,14 @@
 #define yaffs_sprintf	     sprintf
 #define yaffs_toupper(a)     toupper(a)
 
+#define hweight8(x)	yaffs_hweight8(x)
+#define hweight32(x)	yaffs_hweight32(x)
+
+void yaffs_qsort(void *aa, size_t n, size_t es,
+        int (*cmp)(const void *, const void *));
+
+#define yaffs_sort(base, n, sz, cmp_fn) yaffs_qsort(base, n, sz, cmp_fn)
+        
 #define YAFFS_PATH_DIVIDERS  "/"
 
 #ifdef NO_Y_INLINE
@@ -87,6 +96,8 @@
 #define yaffs_sum_cmp(x,y) ((x) == (y))
 #define yaffs_strcmp(a,b) strcmp(a,b)
 
+#include "yaffs_list.h"
+
 #include "yaffsfs.h"
 
 #endif