dmitry Tue Nov 6 12:06:05 2007 UTC
Modified files: (Branch: PHP_5_3)
/ZendEngine2 zend_alloc.c zend_alloc.h
Log:
Fixed windows build (Rob)
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_alloc.c?r1=1.144.2.3.2.43.2.3&r2=1.144.2.3.2.43.2.4&diff_format=u
Index: ZendEngine2/zend_alloc.c
diff -u ZendEngine2/zend_alloc.c:1.144.2.3.2.43.2.3
ZendEngine2/zend_alloc.c:1.144.2.3.2.43.2.4
--- ZendEngine2/zend_alloc.c:1.144.2.3.2.43.2.3 Tue Nov 6 07:22:13 2007
+++ ZendEngine2/zend_alloc.c Tue Nov 6 12:06:05 2007
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_alloc.c,v 1.144.2.3.2.43.2.3 2007/11/06 07:22:13 dmitry Exp $ */
+/* $Id: zend_alloc.c,v 1.144.2.3.2.43.2.4 2007/11/06 12:06:05 dmitry Exp $ */
#include "zend.h"
#include "zend_alloc.h"
@@ -403,9 +403,9 @@
struct _zend_mm_heap {
int use_zend_alloc;
- void *(*malloc)(size_t);
- void (*free)(void*);
- void *(*realloc)(void*, size_t);
+ void *(*_malloc)(size_t);
+ void (*_free)(void*);
+ void *(*_realloc)(void*, size_t);
size_t free_bitmap;
size_t large_free_bitmap;
size_t block_size;
@@ -2267,7 +2267,7 @@
TSRMLS_FETCH();
if (UNEXPECTED(!AG(mm_heap)->use_zend_alloc)) {
- return AG(mm_heap)->malloc(size);
+ return AG(mm_heap)->_malloc(size);
}
return _zend_mm_alloc_int(AG(mm_heap), size ZEND_FILE_LINE_RELAY_CC
ZEND_FILE_LINE_ORIG_RELAY_CC);
}
@@ -2277,7 +2277,7 @@
TSRMLS_FETCH();
if (UNEXPECTED(!AG(mm_heap)->use_zend_alloc)) {
- AG(mm_heap)->free(ptr);
+ AG(mm_heap)->_free(ptr);
return;
}
_zend_mm_free_int(AG(mm_heap), ptr ZEND_FILE_LINE_RELAY_CC
ZEND_FILE_LINE_ORIG_RELAY_CC);
@@ -2288,7 +2288,7 @@
TSRMLS_FETCH();
if (UNEXPECTED(!AG(mm_heap)->use_zend_alloc)) {
- return AG(mm_heap)->realloc(ptr, size);
+ return AG(mm_heap)->_realloc(ptr, size);
}
return _zend_mm_realloc_int(AG(mm_heap), ptr, size
ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
}
@@ -2456,9 +2456,9 @@
if (tmp) {
alloc_globals->mm_heap->use_zend_alloc = zend_atoi(tmp, 0);
if (!alloc_globals->mm_heap->use_zend_alloc) {
- alloc_globals->mm_heap->malloc = malloc;
- alloc_globals->mm_heap->free = free;
- alloc_globals->mm_heap->realloc = realloc;
+ alloc_globals->mm_heap->_malloc = malloc;
+ alloc_globals->mm_heap->_free = free;
+ alloc_globals->mm_heap->_realloc = realloc;
}
}
}
@@ -2494,14 +2494,14 @@
}
ZEND_API void zend_mm_set_custom_handlers(zend_mm_heap *heap,
- void* (*malloc)(size_t),
- void (*free)(void*),
- void* (realloc)(void*, size_t))
+ void* (*_malloc)(size_t),
+ void (*_free)(void*),
+ void* (*_realloc)(void*, size_t))
{
heap->use_zend_alloc = 0;
- heap->malloc = malloc;
- heap->free = free;
- heap->realloc = realloc;
+ heap->_malloc = _malloc;
+ heap->_free = _free;
+ heap->_realloc = _realloc;
}
#if ZEND_DEBUG
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_alloc.h?r1=1.63.2.2.2.12.2.2&r2=1.63.2.2.2.12.2.3&diff_format=u
Index: ZendEngine2/zend_alloc.h
diff -u ZendEngine2/zend_alloc.h:1.63.2.2.2.12.2.2
ZendEngine2/zend_alloc.h:1.63.2.2.2.12.2.3
--- ZendEngine2/zend_alloc.h:1.63.2.2.2.12.2.2 Tue Nov 6 07:22:13 2007
+++ ZendEngine2/zend_alloc.h Tue Nov 6 12:06:05 2007
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_alloc.h,v 1.63.2.2.2.12.2.2 2007/11/06 07:22:13 dmitry Exp $ */
+/* $Id: zend_alloc.h,v 1.63.2.2.2.12.2.3 2007/11/06 12:06:05 dmitry Exp $ */
#ifndef ZEND_ALLOC_H
#define ZEND_ALLOC_H
@@ -234,9 +234,9 @@
ZEND_API zend_mm_storage *zend_mm_get_storage(zend_mm_heap *heap);
ZEND_API void zend_mm_set_custom_handlers(zend_mm_heap *heap,
- void* (*malloc)(size_t),
- void (*free)(void*),
- void* (realloc)(void*, size_t));
+ void* (*_malloc)(size_t),
+ void (*_free)(void*),
+ void* (*_realloc)(void*, size_t));
#endif
--
Zend Engine CVS Mailing List (http://cvs.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
|
