X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=php_http_std_defs.h;h=2e575a38d86bc6f9c339c049f7fa44e976050dbe;hb=a93c1059c61026dab25278d0839c44745fc117b6;hp=92defa0e2e6df3f1fd67966b1b000f10c5b11e2d;hpb=b8e107f69fcd64811e2dd428b6980412749cbc7b;p=m6w6%2Fext-http diff --git a/php_http_std_defs.h b/php_http_std_defs.h index 92defa0..2e575a3 100644 --- a/php_http_std_defs.h +++ b/php_http_std_defs.h @@ -133,6 +133,12 @@ typedef int STATUS; "ACL, " \ /* END */ +#ifdef ZEND_ENGINE_2 +# include "ext/standard/file.h" +# define HTTP_DEFAULT_STREAM_CONTEXT FG(default_context) +#else +# define HTTP_DEFAULT_STREAM_CONTEXT NULL +#endif #define HTTP_PHP_INI_ENTRY(entry, default, scope, updater, global) \ STD_PHP_INI_ENTRY(entry, default, scope, updater, global, zend_http_globals, http_globals) @@ -288,9 +294,9 @@ typedef int STATUS; #endif #ifdef ZEND_ENGINE_2 # define HE_THROW E_THROW TSRMLS_CC -# define HE_NOTICE (HTTP_G(only_exceptions) ? E_THROW : E_NOTICE) TSRMLS_CC -# define HE_WARNING (HTTP_G(only_exceptions) ? E_THROW : E_WARNING) TSRMLS_CC -# define HE_ERROR (HTTP_G(only_exceptions) ? E_THROW : E_ERROR) TSRMLS_CC +# define HE_NOTICE (HTTP_G->only_exceptions ? E_THROW : E_NOTICE) TSRMLS_CC +# define HE_WARNING (HTTP_G->only_exceptions ? E_THROW : E_WARNING) TSRMLS_CC +# define HE_ERROR (HTTP_G->only_exceptions ? E_THROW : E_ERROR) TSRMLS_CC #else # define HE_THROW E_WARNING TSRMLS_CC # define HE_NOTICE E_NOTICE TSRMLS_CC