projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
- consistent usage of HTTP_G macro (only)
[m6w6/ext-http]
/
php_http.h
diff --git
a/php_http.h
b/php_http.h
index 4aa2679dd2ccb5a7b76574c7422f0ba43085dd7c..7302098ea1fa4a02308255c30ba11c6ca1ae1eed 100644
(file)
--- a/
php_http.h
+++ b/
php_http.h
@@
-35,7
+35,7
@@
# define HTTP_HAVE_SAPI_RTIME
# define HTTP_GET_REQUEST_TIME() sapi_get_request_time(TSRMLS_C)
# else
# define HTTP_HAVE_SAPI_RTIME
# define HTTP_GET_REQUEST_TIME() sapi_get_request_time(TSRMLS_C)
# else
-# define HTTP_GET_REQUEST_TIME() HTTP_G
(request_time)
+# define HTTP_GET_REQUEST_TIME() HTTP_G
->request_time
# endif
# include "SAPI.h"
#endif
# endif
# include "SAPI.h"
#endif
@@
-139,13
+139,10
@@
ZEND_EXTERN_MODULE_GLOBALS(http);
#ifdef ZTS
# include "TSRM.h"
#ifdef ZTS
# include "TSRM.h"
-# define HTTP_G(v) TSRMG(http_globals_id, zend_http_globals *, v)
-# define HTTP_GLOBALS ((zend_http_globals *) (*((void ***) tsrm_ls))[TSRM_UNSHUFFLE_RSRC_ID(http_globals_id)])
+# define HTTP_G ((zend_http_globals *) (*((void ***) tsrm_ls))[TSRM_UNSHUFFLE_RSRC_ID(http_globals_id)])
#else
#else
-# define HTTP_G(v) (http_globals.v)
-# define HTTP_GLOBALS (&http_globals)
+# define HTTP_G (&http_globals)
#endif
#endif
-#define getGlobals(G) zend_http_globals *G = HTTP_GLOBALS
PHP_FUNCTION(http_test);
PHP_FUNCTION(http_date);
PHP_FUNCTION(http_test);
PHP_FUNCTION(http_date);