projects
/
yaffs2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'mainlining'
[yaffs2.git]
/
direct
/
ydirectenv.h
diff --git
a/direct/ydirectenv.h
b/direct/ydirectenv.h
index ee6e8f5a2912d3d56713a1eed42828ee5390c7fa..ceaa6c8423e1a4fad573c5215815d9a31817ea0f 100644
(file)
--- a/
direct/ydirectenv.h
+++ b/
direct/ydirectenv.h
@@
-25,7
+25,8
@@
#include "stdlib.h"
#include "stdio.h"
#include "string.h"
#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)
#include "assert.h"
#define YBUG() assert(0)
@@
-43,6
+44,9
@@
#define yaffs_sprintf sprintf
#define yaffs_toupper(a) toupper(a)
#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 *));
void yaffs_qsort(void *aa, size_t n, size_t es,
int (*cmp)(const void *, const void *));
@@
-94,7
+98,6
@@
void yaffs_qsort(void *aa, size_t n, size_t es,
#include "yaffs_list.h"
#include "yaffs_list.h"
-
#include "yaffsfs.h"
#endif
#include "yaffsfs.h"
#endif