1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
|
Gentooo bug 409963
diff --git a/ext/php/phpext.c b/ext/php/phpext.c
index a7d7500..c0b5646 100644
--- a/ext/php/phpext.c
+++ b/ext/php/phpext.c
@@ -198,7 +198,7 @@ static int psex_determine_array_type(HashTable *myht TSRMLS_DC) /* {{{ */
-function_entry syck_functions[] = {
+zend_function_entry syck_functions[] = {
PHP_FE(syck_load, arginfo_syck_load)
PHP_FE(syck_dump, arginfo_syck_dump)
{NULL, NULL, NULL} /* Must be the last line in syck_functions[] */
@@ -403,7 +403,7 @@ SYMID php_syck_handler(SyckParser *p, SyckNode *n)
strncpy(classname, n->type_id + 12, classname_len + 1);
- if (FAILURE == zend_lookup_class_ex(classname, classname_len, 1, &ce TSRMLS_CC)) {
+ if (FAILURE == zend_lookup_class(classname, classname_len, &ce TSRMLS_CC)) {
zend_throw_exception_ex(syck_exception_entry, 0 TSRMLS_CC, "Couldn't find %s class on line %d, col %d: '%s'", classname, p->linect + 1, p->cursor - p->lineptr, p->lineptr);
efree(classname);
break;
@@ -439,7 +439,7 @@ SYMID php_syck_handler(SyckParser *p, SyckNode *n)
strncpy(classname, n->type_id + 11, classname_len + 1);
- if (FAILURE == zend_lookup_class_ex(classname, classname_len, 1, &ce TSRMLS_CC)) {
+ if (FAILURE == zend_lookup_class(classname, classname_len, &ce TSRMLS_CC)) {
zend_throw_exception_ex(syck_exception_entry, 0 TSRMLS_CC, "Couldn't find %s class on line %d, col %d: '%s'", classname, p->linect + 1, p->cursor - p->lineptr, p->lineptr);
efree(classname);
break;
@@ -511,7 +511,7 @@ SYMID php_syck_handler(SyckParser *p, SyckNode *n)
strncpy(classname, n->type_id + 10, classname_len + 1);
- if (FAILURE == zend_lookup_class_ex(classname, classname_len, 1, &ce TSRMLS_CC)) {
+ if (FAILURE == zend_lookup_class(classname, classname_len, &ce TSRMLS_CC)) {
zend_throw_exception_ex(syck_exception_entry, 0 TSRMLS_CC, "Couldn't find %s class on line %d, col %d: '%s'", classname, p->linect + 1, p->cursor - p->lineptr, p->lineptr);
efree(classname);
break;
|
GitWeb
