diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2020-05-27 09:58:10 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2020-06-05 11:17:05 +0200 |
| commit | 5a04796f760a9e4770ccca5006ec5076dec0450c (patch) | |
| tree | ca5e1aa5ae10269dc862656f8bd77e55b7d8a94c /TSRM | |
| parent | 536c02b0038ab3fd2d0ef9c2ec3dfe4565ef1b31 (diff) | |
| download | php-git-5a04796f760a9e4770ccca5006ec5076dec0450c.tar.gz | |
Fix MSVC level 1 (severe) warnings
We fix (hopefully) all instances of:
* <https://docs.microsoft.com/en-us/cpp/error-messages/compiler-warnings/compiler-warning-level-1-c4005>
* <https://docs.microsoft.com/en-us/cpp/error-messages/compiler-warnings/compiler-warning-level-1-c4024>
* <https://docs.microsoft.com/en-us/cpp/error-messages/compiler-warnings/compiler-warning-level-1-c4028>
* <https://docs.microsoft.com/en-us/cpp/error-messages/compiler-warnings/compiler-warning-level-1-c4047>
* <https://docs.microsoft.com/en-us/cpp/error-messages/compiler-warnings/compiler-warning-level-1-c4087>
* <https://docs.microsoft.com/en-us/cpp/error-messages/compiler-warnings/compiler-warning-level-1-c4090>
* <https://docs.microsoft.com/en-us/cpp/error-messages/compiler-warnings/compiler-warning-level-1-c4273>
* <https://docs.microsoft.com/en-us/cpp/error-messages/compiler-warnings/compiler-warning-level-1-c4312>
`zend_llist_add_element()` and `zend_llist_prepend_element()` now
explicitly expect a *const* pointer.
We use the macro `ZEND_VOIDP()` instead of a `(void*)` cast to suppress
C4090; this should prevent accidential removal of the cast by
clarifying the intention, and makes it easier to remove the casts if
the issue[1] will be resolved sometime.
[1] <https://developercommunity.visualstudio.com/content/problem/390711/c-compiler-incorrect-propagation-of-const-qualifie.html>
Diffstat (limited to 'TSRM')
| -rw-r--r-- | TSRM/tsrm_win32.c | 2 | ||||
| -rw-r--r-- | TSRM/tsrm_win32.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/TSRM/tsrm_win32.c b/TSRM/tsrm_win32.c index 05c47d146a..15659ba546 100644 --- a/TSRM/tsrm_win32.c +++ b/TSRM/tsrm_win32.c @@ -103,7 +103,7 @@ TSRM_API void tsrm_win32_shutdown(void) #endif }/*}}}*/ -char * tsrm_win32_get_path_sid_key(const char *pathname, size_t pathname_len, size_t *key_len) +const char * tsrm_win32_get_path_sid_key(const char *pathname, size_t pathname_len, size_t *key_len) {/*{{{*/ PSID pSid = TWG(impersonation_token_sid); char *ptcSid = NULL; diff --git a/TSRM/tsrm_win32.h b/TSRM/tsrm_win32.h index c16006512a..e002032218 100644 --- a/TSRM/tsrm_win32.h +++ b/TSRM/tsrm_win32.h @@ -89,7 +89,7 @@ TSRMLS_CACHE_EXTERN() #define SHM_RND FILE_MAP_WRITE #define SHM_REMAP FILE_MAP_COPY -char * tsrm_win32_get_path_sid_key(const char *pathname, size_t pathname_len, size_t *key_len); +const char * tsrm_win32_get_path_sid_key(const char *pathname, size_t pathname_len, size_t *key_len); TSRM_API void tsrm_win32_startup(void); TSRM_API void tsrm_win32_shutdown(void); |