[PATCH 2/3] Refactor malloc.h.

[Masaki Muranaka]

From: Masaki Muranaka <monaka at monami-ya.com>

 Some functions should be defined in stdlib.h or unistd.h.

Signed-off-by: Masaki Muranaka <monaka at monami-ya.jp>
---
 include/malloc.h       |  8 +++-----
 include/malloc_isoc.h  | 11 +++++++++++
 include/malloc_posix.h |  8 ++++++++
 include/stdlib.h       |  1 +
 include/unistd.h       |  6 ++++++
 5 files changed, 29 insertions(+), 5 deletions(-)
 create mode 100644 include/malloc_isoc.h
 create mode 100644 include/malloc_posix.h
 create mode 100644 include/unistd.h

diff --git a/include/malloc.h b/include/malloc.h
index 7b9b062..9554597 100644
--- a/include/malloc.h
+++ b/include/malloc.h
@@ -5,20 +5,18 @@
 
 /* Public routines */
 
-void* malloc(size_t);
-void free(void*);
-void* realloc(void*, size_t);
+#include <malloc_isoc.h>
+#include <malloc_posix.h>
+
 void* memalign(size_t, size_t);
 void* vallocc(size_t);
 void* pvalloc(size_t);
-void* calloc(size_t, size_t);
 void cfree(void*);
 int malloc_trim(size_t);
 size_t malloc_usable_size(void*);
 void malloc_stats(void);
 int mallopt(int, int);
 struct mallinfo mallinfo(void);
-void *sbrk(ptrdiff_t increment);
 
 #endif
 
diff --git a/include/malloc_isoc.h b/include/malloc_isoc.h
new file mode 100644
index 0000000..728cdd9
--- /dev/null
+++ b/include/malloc_isoc.h
@@ -0,0 +1,11 @@
+#ifndef BAREBOX_MALLOC_ISOC_H__
+#define BAREBOX_MALLOC_ISOC_H__
+
+#include <types.h>
+
+void* malloc(size_t);
+void free(void*);
+void* realloc(void*, size_t);
+void* calloc(size_t, size_t);
+
+#endif /* BAREBOX_MALLOC_ISOC_H__ */
diff --git a/include/malloc_posix.h b/include/malloc_posix.h
new file mode 100644
index 0000000..d10675d
--- /dev/null
+++ b/include/malloc_posix.h
@@ -0,0 +1,8 @@
+#ifndef BAREBOX_MALLOC_POSIX_H__
+#define BAREBOX_MALLOC_POSIX_H__
+
+#include <types.h>
+
+void *sbrk(ptrdiff_t increment);
+
+#endif /* BAREBOX_MALLOC_POSIX_H__ */
diff --git a/include/stdlib.h b/include/stdlib.h
index dc72013..0d82bbf 100644
--- a/include/stdlib.h
+++ b/include/stdlib.h
@@ -12,5 +12,6 @@ void srand(unsigned int seed);
 /* fill a buffer with pseudo-random data */
 void get_random_bytes(char *buf, int len);
 
+#include <malloc_isoc.h>
 
 #endif /* __STDLIB_H */
diff --git a/include/unistd.h b/include/unistd.h
new file mode 100644
index 0000000..a6abfa6
--- /dev/null
+++ b/include/unistd.h
@@ -0,0 +1,6 @@
+#ifndef BAREBOX_UNISTD_H__
+#define BAREBOX_UNISTD_H__
+
+#include <malloc_posix.h>
+
+#endif /* BAREBOX_UNISTD_H__ */
-- 
1.8.3