Changeset eb522e8 in mainline for uspace/lib/c/generic/private/malloc.h

Timestamp:

2011-06-01T08:43:42Z (14 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

8d6c1f1

Parents:

9e2e715 (diff), e51a514 (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:

Huuuuuge merge from development - all the work actually

File:

• uspace/lib/c/generic/private/malloc.h (moved) (moved from kernel/arch/sparc64/include/mm/cache.h ) (3 diffs)

uspace/lib/c/generic/private/malloc.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2006 Jakub Jermar
+ * Copyright (c) 2011 Martin Decky
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup sparc64mm       
+/** @addtogroup libc
  * @{
  */
@@ -33 +33 @@
  */
 
-#ifndef KERN_sparc64_CACHE_H_
-#define KERN_sparc64_CACHE_H_
+#ifndef LIBC_PRIVATE_MALLOC_H_
+#define LIBC_PRIVATE_MALLOC_H_
 
-#include <mm/page.h>
-#include <mm/frame.h>
+extern void __malloc_init(void);
 
 #endif