summaryrefslogtreecommitdiff
path: root/Zend/zend_dynamic_array.c
diff options
context:
space:
mode:
authorAndi Gutmans <andi@php.net>2000-02-18 09:18:19 +0000
committerAndi Gutmans <andi@php.net>2000-02-18 09:18:19 +0000
commitee26ec5e9cff3e12c4ba2c203948ac5384b83f98 (patch)
tree7863cc35d11101fbac96b7a7ad8d4416b361108d /Zend/zend_dynamic_array.c
parent51ef369d458b67493d22e4d682b9fa296304667f (diff)
downloadphp-git-ee26ec5e9cff3e12c4ba2c203948ac5384b83f98.tar.gz
- Didn't compile on Win32
Diffstat (limited to 'Zend/zend_dynamic_array.c')
-rw-r--r--Zend/zend_dynamic_array.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/Zend/zend_dynamic_array.c b/Zend/zend_dynamic_array.c
index 84bba015b2..19cdcdac33 100644
--- a/Zend/zend_dynamic_array.c
+++ b/Zend/zend_dynamic_array.c
@@ -20,7 +20,7 @@
#include "zend.h"
typedef struct _dynamic_array {
- void *array;
+ char *array;
unsigned int element_size;
unsigned int current;
unsigned int allocated;
@@ -31,7 +31,7 @@ ZEND_API int zend_dynamic_array_init(dynamic_array *da, unsigned int element_siz
da->element_size = element_size;
da->allocated = size;
da->current = 0;
- da->array = (void *) emalloc(size*element_size);
+ da->array = (char *) emalloc(size*element_size);
if (da->array == NULL) {
return 1;
}
@@ -42,14 +42,14 @@ ZEND_API void *zend_dynamic_array_push(dynamic_array *da)
{
if (da->current == da->allocated) {
da->allocated *= 2;
- da->array = (void *) erealloc(da->array, da->allocated*da->element_size);
+ da->array = (char *) erealloc(da->array, da->allocated*da->element_size);
}
- return (da->array+(da->current++)*da->element_size);
+ return (void *)(da->array+(da->current++)*da->element_size);
}
ZEND_API void *zend_dynamic_array_pop(dynamic_array *da)
{
- return (da->array+(--(da->current))*da->element_size);
+ return (void *)(da->array+(--(da->current))*da->element_size);
}
@@ -58,5 +58,5 @@ ZEND_API void *zend_dynamic_array_get_element(dynamic_array *da, unsigned int in
if (index >= da->current) {
return NULL;
}
- return (da->array+index*da->element_size);
+ return (void *)(da->array+index*da->element_size);
}