- Didn't compile on Win32

diff --git a/Zend/ZendTS.dsp b/Zend/ZendTS.dsp
index 4976e6a71289dd368332e7fc1df403c600a239fe..4090625447ad51c9eabe2e1624ad251695caaf77 100644 (file)
--- a/Zend/ZendTS.dsp
+++ b/Zend/ZendTS.dsp
@@ -139,6 +139,10 @@ SOURCE=.\zend_constants.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\zend_dynamic_array.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\zend_execute.c\r
 # End Source File\r
 # Begin Source File\r
@@ -243,6 +247,10 @@ SOURCE=.\zend_constants.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\zend_dynamic_array.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\zend_errors.h\r
 # End Source File\r
 # Begin Source File\r

diff --git a/Zend/zend_dynamic_array.c b/Zend/zend_dynamic_array.c
index 84bba015b2915861be4921b51a08bc27287ff4b6..19cdcdac337e0a3834e527b5e59802dadd3df858 100644 (file)
--- 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);
 }