#
#
# patch "include/defalloc.h"
#  from [ef3958943a473c5a5068dbf77eae02e7cafa55fa]
#    to [e7507091a397628e401de0bd41be48bbbf929ff9]
# 
# patch "src/defalloc.cpp"
#  from [940db8ef03ae170341d257f9f7e4320ee3938935]
#    to [e51a9fe4f6a6e191818c3e968213cc58e98cc6c2]
#
============================================================
--- include/defalloc.h	ef3958943a473c5a5068dbf77eae02e7cafa55fa
+++ include/defalloc.h	e7507091a397628e401de0bd41be48bbbf929ff9
@@ -13,14 +13,13 @@ namespace Botan {
 /*************************************************
 * Malloc Allocator                              *
 *************************************************/
-class Malloc_Allocator : public Pooling_Allocator
+class Malloc_Allocator : public Allocator
    {
    public:
-      Malloc_Allocator() : Pooling_Allocator(64*1024, false) {}
+      void* allocate(u32bit);
+      void deallocate(void*, u32bit);
+
       std::string type() const { return "malloc"; }
-   private:
-      void* alloc_block(u32bit);
-      void dealloc_block(void*, u32bit);
    };
 
 /*************************************************
============================================================
--- src/defalloc.cpp	940db8ef03ae170341d257f9f7e4320ee3938935
+++ src/defalloc.cpp	e51a9fe4f6a6e191818c3e968213cc58e98cc6c2
@@ -50,7 +50,7 @@ void do_free(void* ptr, u32bit n, bool d
 /*************************************************
 * Malloc_Allocator's Allocation                  *
 *************************************************/
-void* Malloc_Allocator::alloc_block(u32bit n)
+void* Malloc_Allocator::allocate(u32bit n)
    {
    return do_malloc(n, false);
    }
@@ -58,7 +58,7 @@ void* Malloc_Allocator::alloc_block(u32b
 /*************************************************
 * Malloc_Allocator's Deallocation                *
 *************************************************/
-void Malloc_Allocator::dealloc_block(void* ptr, u32bit n)
+void Malloc_Allocator::deallocate(void* ptr, u32bit n)
    {
    do_free(ptr, n, false);
    }