Remove persistent allocators from libmbfl

These functions are not used, and I don't think we have any plans
to ever use them.

diff --git a/ext/mbstring/libmbfl/mbfl/mbfl_allocators.h b/ext/mbstring/libmbfl/mbfl/mbfl_allocators.h
index 08fc275d04c1e8ffcd1c693f9d5129067f6ff7cb..5caf25097ef475544820fe572d842f4c4af89a30 100644 (file)
--- a/ext/mbstring/libmbfl/mbfl/mbfl_allocators.h
+++ b/ext/mbstring/libmbfl/mbfl/mbfl_allocators.h
@@ -39,9 +39,6 @@ typedef struct _mbfl_allocators {
        void *(*realloc)(void *, size_t);
        void *(*calloc)(size_t, size_t);
        void (*free)(void *);
-       void *(*pmalloc)(size_t);
-       void *(*prealloc)(void *, size_t);
-       void (*pfree)(void *);
 } mbfl_allocators;
 
 MBFLAPI extern mbfl_allocators *__mbfl_allocators;
@@ -50,8 +47,5 @@ MBFLAPI extern mbfl_allocators *__mbfl_allocators;
 #define mbfl_realloc (__mbfl_allocators->realloc)
 #define mbfl_calloc (__mbfl_allocators->calloc)
 #define mbfl_free (__mbfl_allocators->free)
-#define mbfl_pmalloc (__mbfl_allocators->pmalloc)
-#define mbfl_prealloc (__mbfl_allocators->preallloc)
-#define mbfl_pfree (__mbfl_allocators->pfree)
 
 #endif /* MBFL_ALLOCATORS_H */

diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
index 652027f4c5fba015e8990faa638fa05813e3c9f5..f636d51b025353808a1c3993b99d925ccc90b5fb 100644 (file)
--- a/ext/mbstring/mbstring.c
+++ b/ext/mbstring/mbstring.c
@@ -237,29 +237,11 @@ static void _php_mb_allocators_free(void *ptr)
        efree(ptr);
 }
 
-static void *_php_mb_allocators_pmalloc(size_t sz)
-{
-       return pemalloc(sz, 1);
-}
-
-static void *_php_mb_allocators_prealloc(void *ptr, size_t sz)
-{
-       return perealloc(ptr, sz, 1);
-}
-
-static void _php_mb_allocators_pfree(void *ptr)
-{
-       pefree(ptr, 1);
-}
-
 static const mbfl_allocators _php_mb_allocators = {
        _php_mb_allocators_malloc,
        _php_mb_allocators_realloc,
        _php_mb_allocators_calloc,
        _php_mb_allocators_free,
-       _php_mb_allocators_pmalloc,
-       _php_mb_allocators_prealloc,
-       _php_mb_allocators_pfree
 };
 /* }}} */