diff options
| author | Andi Gutmans <andi@php.net> | 2000-02-18 09:18:19 +0000 |
|---|---|---|
| committer | Andi Gutmans <andi@php.net> | 2000-02-18 09:18:19 +0000 |
| commit | ee26ec5e9cff3e12c4ba2c203948ac5384b83f98 (patch) | |
| tree | 7863cc35d11101fbac96b7a7ad8d4416b361108d | |
| parent | 51ef369d458b67493d22e4d682b9fa296304667f (diff) | |
| download | php-git-ee26ec5e9cff3e12c4ba2c203948ac5384b83f98.tar.gz | |
- Didn't compile on Win32
| -rw-r--r-- | Zend/ZendTS.dsp | 8 | ||||
| -rw-r--r-- | Zend/zend_dynamic_array.c | 12 |
2 files changed, 14 insertions, 6 deletions
diff --git a/Zend/ZendTS.dsp b/Zend/ZendTS.dsp index 4976e6a712..4090625447 100644 --- a/Zend/ZendTS.dsp +++ b/Zend/ZendTS.dsp @@ -139,6 +139,10 @@ SOURCE=.\zend_constants.c # End Source File
# Begin Source File
+SOURCE=.\zend_dynamic_array.c
+# End Source File
+# Begin Source File
+
SOURCE=.\zend_execute.c
# End Source File
# Begin Source File
@@ -243,6 +247,10 @@ SOURCE=.\zend_constants.h # End Source File
# Begin Source File
+SOURCE=.\zend_dynamic_array.h
+# End Source File
+# Begin Source File
+
SOURCE=.\zend_errors.h
# End Source File
# Begin Source File
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); } |