X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=src%2Fphp_http_exception.h;h=5acf28031a9ad33758f25eacc38b61f8b698c4e1;hp=969a3514872392c95ccd72ed8920920690333837;hb=53a654ed6e112b2766b41c01a1c2bb79373c59e4;hpb=bdd6edb59194cda9e5fcb393c48ab4230fceb32a diff --git a/src/php_http_exception.h b/src/php_http_exception.h index 969a351..5acf280 100644 --- a/src/php_http_exception.h +++ b/src/php_http_exception.h @@ -15,30 +15,30 @@ /* short hand for zend_throw_exception_ex */ #define php_http_throw(e, fmt, ...) \ - zend_throw_exception_ex(php_http_exception_ ##e## _class_entry, 0 TSRMLS_CC, fmt, __VA_ARGS__) + zend_throw_exception_ex(php_http_get_exception_ ##e## _class_entry(), 0, fmt, __VA_ARGS__) /* wrap a call with replaced zend_error_handling */ #define php_http_expect(test, e, fail) \ do { \ zend_error_handling __zeh; \ - zend_replace_error_handling(EH_THROW, php_http_exception_ ##e## _class_entry, &__zeh TSRMLS_CC); \ + zend_replace_error_handling(EH_THROW, php_http_get_exception_ ##e## _class_entry(), &__zeh); \ if (!(test)) { \ - zend_restore_error_handling(&__zeh TSRMLS_CC); \ + zend_restore_error_handling(&__zeh); \ fail; \ } \ - zend_restore_error_handling(&__zeh TSRMLS_CC); \ + zend_restore_error_handling(&__zeh); \ } while(0) -PHP_HTTP_API zend_class_entry *php_http_exception_interface_class_entry; -PHP_HTTP_API zend_class_entry *php_http_exception_runtime_class_entry; -PHP_HTTP_API zend_class_entry *php_http_exception_unexpected_val_class_entry; -PHP_HTTP_API zend_class_entry *php_http_exception_bad_method_call_class_entry; -PHP_HTTP_API zend_class_entry *php_http_exception_invalid_arg_class_entry; -PHP_HTTP_API zend_class_entry *php_http_exception_bad_header_class_entry; -PHP_HTTP_API zend_class_entry *php_http_exception_bad_url_class_entry; -PHP_HTTP_API zend_class_entry *php_http_exception_bad_message_class_entry; -PHP_HTTP_API zend_class_entry *php_http_exception_bad_conversion_class_entry; -PHP_HTTP_API zend_class_entry *php_http_exception_bad_querystring_class_entry; +PHP_HTTP_API zend_class_entry *php_http_get_exception_interface_class_entry(void); +PHP_HTTP_API zend_class_entry *php_http_get_exception_runtime_class_entry(void); +PHP_HTTP_API zend_class_entry *php_http_get_exception_unexpected_val_class_entry(void); +PHP_HTTP_API zend_class_entry *php_http_get_exception_bad_method_call_class_entry(void); +PHP_HTTP_API zend_class_entry *php_http_get_exception_invalid_arg_class_entry(void); +PHP_HTTP_API zend_class_entry *php_http_get_exception_bad_header_class_entry(void); +PHP_HTTP_API zend_class_entry *php_http_get_exception_bad_url_class_entry(void); +PHP_HTTP_API zend_class_entry *php_http_get_exception_bad_message_class_entry(void); +PHP_HTTP_API zend_class_entry *php_http_get_exception_bad_conversion_class_entry(void); +PHP_HTTP_API zend_class_entry *php_http_get_exception_bad_querystring_class_entry(void); PHP_MINIT_FUNCTION(http_exception);