projects
/
yaffs2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://www.aleph1.co.uk/home/aleph1/git/yaffs2
[yaffs2.git]
/
direct
/
ydirectenv.h
diff --git
a/direct/ydirectenv.h
b/direct/ydirectenv.h
index d3e27114eedf081a2360e81326a71e33a68f547e..ee6e8f5a2912d3d56713a1eed42828ee5390c7fa 100644
(file)
--- a/
direct/ydirectenv.h
+++ b/
direct/ydirectenv.h
@@
-22,8
+22,6
@@
// Direct interface
// Direct interface
-#include "devextras.h"
-
#include "stdlib.h"
#include "stdio.h"
#include "string.h"
#include "stdlib.h"
#include "stdio.h"
#include "string.h"
@@
-45,12
+43,17
@@
#define yaffs_sprintf sprintf
#define yaffs_toupper(a) toupper(a)
#define yaffs_sprintf sprintf
#define yaffs_toupper(a) toupper(a)
+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
#define Y_INLINE
#else
#define YAFFS_PATH_DIVIDERS "/"
#ifdef NO_Y_INLINE
#define Y_INLINE
#else
-#define Y_INLINE
inline
+#define Y_INLINE
__inline__
#endif
#define YMALLOC(x) yaffs_malloc(x)
#endif
#define YMALLOC(x) yaffs_malloc(x)
@@
-86,9
+89,12
@@
#define YAFFS_ROOT_MODE 0666
#define YAFFS_LOSTNFOUND_MODE 0666
#define YAFFS_ROOT_MODE 0666
#define YAFFS_LOSTNFOUND_MODE 0666
-#define yaffs_
SumCompare
(x,y) ((x) == (y))
+#define yaffs_
sum_cmp
(x,y) ((x) == (y))
#define yaffs_strcmp(a,b) strcmp(a,b)
#define yaffs_strcmp(a,b) strcmp(a,b)
+#include "yaffs_list.h"
+
+
#include "yaffsfs.h"
#endif
#include "yaffsfs.h"
#endif