- nuke php3 legacy

diff --git a/main/main.c b/main/main.c
index f2195624fba80af07f1e60d0ce380021e38738ee..c7609474b42b12979a414f6f978a4259506e0ce0 100644 (file)
--- a/main/main.c
+++ b/main/main.c
@@ -679,7 +679,7 @@ PHPAPI void php_verror(const char *docref, const char *params, int type, const c
                zval *tmp;
                ALLOC_INIT_ZVAL(tmp);
                ZVAL_STRINGL(tmp, buffer, buffer_len, 1);
-               zend_hash_update(EG(active_symbol_table), "php_errormsg", sizeof("php_errormsg"), (void **) &tmp, sizeof(pval *), NULL);
+               zend_hash_update(EG(active_symbol_table), "php_errormsg", sizeof("php_errormsg"), (void **) &tmp, sizeof(zval *), NULL);
        }
        efree(buffer);
 }
@@ -935,14 +935,14 @@ static void php_error_cb(int type, const char *error_filename, const uint error_
                return;
        }
        if (PG(track_errors) && module_initialized && EG(active_symbol_table)) {
-               pval *tmp;
+               zval *tmp;
 
                ALLOC_ZVAL(tmp);
                INIT_PZVAL(tmp);
                Z_STRVAL_P(tmp) = (char *) estrndup(buffer, buffer_len);
                Z_STRLEN_P(tmp) = buffer_len;
                Z_TYPE_P(tmp) = IS_STRING;
-               zend_hash_update(EG(active_symbol_table), "php_errormsg", sizeof("php_errormsg"), (void **) & tmp, sizeof(pval *), NULL);
+               zend_hash_update(EG(active_symbol_table), "php_errormsg", sizeof("php_errormsg"), (void **) & tmp, sizeof(zval *), NULL);
        }
        efree(buffer);
 }

diff --git a/main/php_variables.h b/main/php_variables.h
index 232b00c5ba2dc92886f1fd00f01c309138a95c93..ab83c0e7ad20e7e6fc1b89d3a5f323ebc2e76890 100644 (file)
--- a/main/php_variables.h
+++ b/main/php_variables.h
@@ -34,12 +34,12 @@ BEGIN_EXTERN_C()
 void php_treat_data(int arg, char *str, zval* destArray TSRMLS_DC);
 void php_startup_auto_globals(TSRMLS_D);
 extern PHPAPI void (*php_import_environment_variables)(zval *array_ptr TSRMLS_DC);
-PHPAPI void php_register_variable(char *var, char *val, pval *track_vars_array TSRMLS_DC);
+PHPAPI void php_register_variable(char *var, char *val, zval *track_vars_array TSRMLS_DC);
 /* binary-safe version */
-PHPAPI void php_register_variable_safe(char *var, char *val, int val_len, pval *track_vars_array TSRMLS_DC);
-PHPAPI void php_register_variable_ex(char *var, zval *val, pval *track_vars_array TSRMLS_DC);
+PHPAPI void php_register_variable_safe(char *var, char *val, int val_len, zval *track_vars_array TSRMLS_DC);
+PHPAPI void php_register_variable_ex(char *var, zval *val, zval *track_vars_array TSRMLS_DC);
 PHPAPI void php_u_register_variable_safe(UChar *var, UChar *strval, int32_t str_len, zval *track_vars_array TSRMLS_DC);
-PHPAPI void php_u_register_variable_ex(UChar *var, zval *val, pval *track_vars_array TSRMLS_DC);
+PHPAPI void php_u_register_variable_ex(UChar *var, zval *val, zval *track_vars_array TSRMLS_DC);
 
 int php_hash_environment(TSRMLS_D);
 END_EXTERN_C()