diff options
| author | Ben Fuhrmannek | 2016-02-22 13:23:16 +0100 |
|---|---|---|
| committer | Ben Fuhrmannek | 2016-02-22 13:23:16 +0100 |
| commit | 759139184a4e322c561de889484f7de3d181756f (patch) | |
| tree | 34f0ceac20058b7f96c003be588c5c7c40bade75 /php_suhosin7.h | |
| parent | e668d3495dce6e33855266fc830fc27b1a003689 (diff) | |
removed TSRMLS
Diffstat (limited to 'php_suhosin7.h')
| -rw-r--r-- | php_suhosin7.h | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/php_suhosin7.h b/php_suhosin7.h index 8c10df9..3af6de6 100644 --- a/php_suhosin7.h +++ b/php_suhosin7.h | |||
| @@ -38,9 +38,6 @@ extern zend_module_entry suhosin7_module_entry; | |||
| 38 | # define PHP_SUHOSIN7_API | 38 | # define PHP_SUHOSIN7_API |
| 39 | #endif | 39 | #endif |
| 40 | 40 | ||
| 41 | #ifdef ZTS | ||
| 42 | #include "TSRM.h" | ||
| 43 | #endif | ||
| 44 | 41 | ||
| 45 | /* -------------- */ | 42 | /* -------------- */ |
| 46 | 43 | ||
| @@ -325,7 +322,7 @@ ZEND_BEGIN_MODULE_GLOBALS(suhosin7) | |||
| 325 | // long sql_union; | 322 | // long sql_union; |
| 326 | // long sql_mselect; | 323 | // long sql_mselect; |
| 327 | 324 | ||
| 328 | // int (*old_php_body_write)(const char *str, unsigned int str_length TSRMLS_DC); | 325 | // int (*old_php_body_write)(const char *str, unsigned int str_length); |
| 329 | 326 | ||
| 330 | ZEND_END_MODULE_GLOBALS(suhosin7) | 327 | ZEND_END_MODULE_GLOBALS(suhosin7) |
| 331 | 328 | ||
| @@ -335,9 +332,6 @@ ZEND_END_MODULE_GLOBALS(suhosin7) | |||
| 335 | */ | 332 | */ |
| 336 | #define SUHOSIN7_G(v) ZEND_MODULE_GLOBALS_ACCESSOR(suhosin7, v) | 333 | #define SUHOSIN7_G(v) ZEND_MODULE_GLOBALS_ACCESSOR(suhosin7, v) |
| 337 | 334 | ||
| 338 | #if defined(ZTS) && defined(COMPILE_DL_SUHOSIN7) | ||
| 339 | ZEND_TSRMLS_CACHE_EXTERN(); | ||
| 340 | #endif | ||
| 341 | 335 | ||
| 342 | /* Error Constants */ | 336 | /* Error Constants */ |
| 343 | #ifndef S_MEMORY | 337 | #ifndef S_MEMORY |
| @@ -379,7 +373,7 @@ void suhosin_hook_treat_data(); | |||
| 379 | void suhosin_hook_execute(); | 373 | void suhosin_hook_execute(); |
| 380 | void suhosin_hook_register_server_variables(); | 374 | void suhosin_hook_register_server_variables(); |
| 381 | 375 | ||
| 382 | static inline void suhosin_bailout(TSRMLS_D) | 376 | static inline void suhosin_bailout() |
| 383 | { | 377 | { |
| 384 | if (!SUHOSIN7_G(simulation)) { | 378 | if (!SUHOSIN7_G(simulation)) { |
| 385 | zend_bailout(); | 379 | zend_bailout(); |
