- fix WONKY build

diff --git a/http_message_object.c b/http_message_object.c
index 71c06d5f108b0dd8fa133890c2402449053e25a0..3161b01f0652e8eae925f60a295b0173cf6ebb72 100644 (file)
--- a/http_message_object.c
+++ b/http_message_object.c
@@ -183,9 +183,11 @@ static inline void _http_message_object_declare_default_properties(TSRMLS_D)
 {
        zend_class_entry *ce = http_message_object_ce;
 
 {
        zend_class_entry *ce = http_message_object_ce;
 

+#ifndef WONKY

        DCL_CONST(long, "NONE", HTTP_MSG_NONE);
        DCL_CONST(long, "REQUEST", HTTP_MSG_REQUEST);
        DCL_CONST(long, "RESPONSE", HTTP_MSG_RESPONSE);
        DCL_CONST(long, "NONE", HTTP_MSG_NONE);
        DCL_CONST(long, "REQUEST", HTTP_MSG_REQUEST);
        DCL_CONST(long, "RESPONSE", HTTP_MSG_RESPONSE);

+#endif

 
        DCL_PROP(PROTECTED, long, type, HTTP_MSG_NONE);
        DCL_PROP(PROTECTED, string, body, "");
 
        DCL_PROP(PROTECTED, long, type, HTTP_MSG_NONE);
        DCL_PROP(PROTECTED, string, body, "");

diff --git a/missing.c b/missing.c
index 4b191ae1acce00b0a5b010baf183d782bf7a2e0f..7febedf19d579b9892b633da254ef4165e5a6a2c 100644 (file)
--- a/missing.c
+++ b/missing.c
@@ -21,28 +21,29 @@
 #ifdef WONKY
 int zend_declare_property_double(zend_class_entry *ce, char *name, int name_length, double value, int access_type TSRMLS_DC)
 {
 #ifdef WONKY
 int zend_declare_property_double(zend_class_entry *ce, char *name, int name_length, double value, int access_type TSRMLS_DC)
 {

-       zval *property = new_zval(ce->type & ZEND_INTERNAL_CLASS);
+       zval *property = pemalloc(sizeof(zval), ce->type & ZEND_INTERNAL_CLASS);
+       INIT_PZVAL(property);

        ZVAL_DOUBLE(property, value);
        return zend_declare_property(ce, name, name_length, property, access_type TSRMLS_CC);
 }
 
 void zend_update_property_double(zend_class_entry *scope, zval *object, char *name, int name_length, double value TSRMLS_DC)
 {
        ZVAL_DOUBLE(property, value);
        return zend_declare_property(ce, name, name_length, property, access_type TSRMLS_CC);
 }
 
 void zend_update_property_double(zend_class_entry *scope, zval *object, char *name, int name_length, double value TSRMLS_DC)
 {

-       zval *tmp = tmp_zval();
+       zval *tmp = ecalloc(1, sizeof(zval));

        ZVAL_DOUBLE(tmp, value);
        zend_update_property(scope, object, name, name_length, tmp TSRMLS_CC);
 }
 
 int zend_declare_property_bool(zend_class_entry *ce, char *name, int name_length, long value, int access_type TSRMLS_DC)
 {
        ZVAL_DOUBLE(tmp, value);
        zend_update_property(scope, object, name, name_length, tmp TSRMLS_CC);
 }
 
 int zend_declare_property_bool(zend_class_entry *ce, char *name, int name_length, long value, int access_type TSRMLS_DC)
 {

-       zval *property = new_zval(ce->type & ZEND_INTERNAL_CLASS);
+       zval *property = pemalloc(sizeof(zval), ce->type & ZEND_INTERNAL_CLASS);
+       INIT_PZVAL(property);

        ZVAL_BOOL(property, value);
        return zend_declare_property(ce, name, name_length, property, access_type TSRMLS_CC);
 }
 
 void zend_update_property_bool(zend_class_entry *scope, zval *object, char *name, int name_length, long value TSRMLS_DC)
        ZVAL_BOOL(property, value);
        return zend_declare_property(ce, name, name_length, property, access_type TSRMLS_CC);
 }
 
 void zend_update_property_bool(zend_class_entry *scope, zval *object, char *name, int name_length, long value TSRMLS_DC)

-{
-       zval *tmp = tmp_zval();
+{      zval *tmp = ecalloc(1, sizeof(zval));

        ZVAL_BOOL(tmp, value);
        zend_update_property(scope, object, name, name_length, tmp TSRMLS_CC);
 }
        ZVAL_BOOL(tmp, value);
        zend_update_property(scope, object, name, name_length, tmp TSRMLS_CC);
 }