Merge branch 'R_2_5'
[m6w6/ext-http] / src / php_http_exception.h
index 969a3514872392c95ccd72ed8920920690333837..eaf7a13c2812ba31d0ea3806cbbf51edcc3e6d46 100644 (file)
 
 /* 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_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_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;