apparently zts needs a TSRMLS_C declaration for invocations of zend_exception_get_default()

This commit is contained in:
Meredith L. Patterson 2013-12-21 15:41:14 +01:00
parent 80eed33825
commit 203bb85b65

View file

@ -43,17 +43,17 @@
zval **data; zval **data;
if (zend_hash_index_find(arr, i, (void**)&data) == FAILURE) { if (zend_hash_index_find(arr, i, (void**)&data) == FAILURE) {
$1 = NULL; $1 = NULL;
zend_throw_exception(zend_exception_get_default(), "index in parser array out of bounds", 0 TSRMLS_CC); zend_throw_exception(zend_exception_get_default(TSRMLS_C), "index in parser array out of bounds", 0 TSRMLS_CC);
} else { } else {
res = SWIG_ConvertPtr(*data, &($1[i]), SWIGTYPE_p_HParser_, 0 | 0); res = SWIG_ConvertPtr(*data, &($1[i]), SWIGTYPE_p_HParser_, 0 | 0);
if (!SWIG_IsOK(res)) { if (!SWIG_IsOK(res)) {
zend_throw_exception(zend_exception_get_default(), "that wasn't an HParser", 0 TSRMLS_CC); zend_throw_exception(zend_exception_get_default(TSRMLS_C), "that wasn't an HParser", 0 TSRMLS_CC);
} }
} }
} }
} else { } else {
$1 = NULL; $1 = NULL;
zend_throw_exception(zend_exception_get_default(), "that wasn't an array of HParsers", 0 TSRMLS_CC); zend_throw_exception(zend_exception_get_default(TSRMLS_C), "that wasn't an array of HParsers", 0 TSRMLS_CC);
} }
} }
@ -157,7 +157,7 @@
int res = 0; int res = 0;
res = SWIG_ConvertPtr(return_value, (void*)token, SWIGTYPE_p_HParsedToken_, 0 | 0); res = SWIG_ConvertPtr(return_value, (void*)token, SWIGTYPE_p_HParsedToken_, 0 | 0);
if (!SWIG_IsOK(res)) { if (!SWIG_IsOK(res)) {
zend_throw_exception(zend_exception_get_default(), "hpt_to_php: that wasn't an HParsedToken", 0 TSRMLS_CC); zend_throw_exception(zend_exception_get_default(TSRMLS_C), "hpt_to_php: that wasn't an HParsedToken", 0 TSRMLS_CC);
} }
// TODO: support registry // TODO: support registry
} }