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 /ext/zend_test/php_test.h | |
| 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 'ext/zend_test/php_test.h')
| -rw-r--r-- | ext/zend_test/php_test.h | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/ext/zend_test/php_test.h b/ext/zend_test/php_test.h index 834c380362..5d9e31cc83 100644 --- a/ext/zend_test/php_test.h +++ b/ext/zend_test/php_test.h @@ -35,7 +35,17 @@ struct bug79096 { uint64_t b; }; -ZEND_API struct bug79096 bug79096(void); -ZEND_API void bug79532(off_t *array, size_t elems); +#ifdef PHP_WIN32 +# ifdef PHP_ZEND_TEST_EXPORTS +# define PHP_ZEND_TEST_API __declspec(dllexport) +# else +# define PHP_ZEND_TEST_API __declspec(dllimport) +# endif +#else +# define PHP_ZEND_TEST_API ZEND_API +#endif + +PHP_ZEND_TEST_API struct bug79096 bug79096(void); +PHP_ZEND_TEST_API void bug79532(off_t *array, size_t elems); #endif |