unified MX27, MX25, MX37 trees

[karo-tx-redboot.git] / packages / services / memalloc / common / v2_0 / src / malloc.cxx

diff --git a/packages/services/memalloc/common/v2_0/src/malloc.cxx b/packages/services/memalloc/common/v2_0/src/malloc.cxx
index ab7f02c0ad3c76cf1b1a5570940eeeab3696fa21..16912af182a9faa16a9f0dffff018dabac0cf298 100644 (file)
--- a/packages/services/memalloc/common/v2_0/src/malloc.cxx
+++ b/packages/services/memalloc/common/v2_0/src/malloc.cxx
@@ -86,7 +86,7 @@ cyg_uint8 cyg_memalloc_mallocpool_memory[
 
 // the memory pool object itself
 CYGCLS_MEMALLOC_MALLOC_IMPL cyg_memalloc_mallocpool
-   CYGBLD_ATTRIB_INIT_BEFORE( CYG_INIT_LIBC ) =
+   CYGBLD_ATTRIB_INIT_PRI( CYG_INIT_MEMALLOC ) =
    CYGCLS_MEMALLOC_MALLOC_IMPL( cyg_memalloc_mallocpool_memory,
                                 sizeof( cyg_memalloc_mallocpool_memory ) );
 
@@ -99,11 +99,14 @@ CYGCLS_MEMALLOC_MALLOC_IMPL cyg_memalloc_mallocpool
 
 #else 
 // multiple heaps
-
+#ifdef CYGBLD_MEMALLOC_MALLOC_EXTERNAL_JOIN_H
+# include CYGBLD_MEMALLOC_MALLOC_EXTERNAL_JOIN_H
+#else
 # include <cyg/memalloc/memjoin.hxx>
+#endif
 
 Cyg_Mempool_Joined<CYGCLS_MEMALLOC_MALLOC_IMPL> cyg_memalloc_mallocpool
-   CYGBLD_ATTRIB_INIT_BEFORE( CYG_INIT_LIBC ) =
+   CYGBLD_ATTRIB_INIT_PRI( CYG_INIT_MEMALLOC ) =
      Cyg_Mempool_Joined<CYGCLS_MEMALLOC_MALLOC_IMPL>(
        CYGMEM_HEAP_COUNT, cygmem_memalloc_heaps
      );