diff options
| author | Anatol Belski <ab@php.net> | 2016-11-26 15:18:42 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2016-11-26 17:29:01 +0100 |
| commit | b204b3abd19f86bd9217866189cdebcc6abc0d95 (patch) | |
| tree | 324e3c86634583ef7d58bc0f3e19dfbdeb85773c /ext/standard/proc_open.c | |
| parent | 1b7e014d1ce21b9eb6021111c1005d047b5b9a1b (diff) | |
| download | php-git-b204b3abd19f86bd9217866189cdebcc6abc0d95.tar.gz | |
further normalizations, uint vs uint32_t
fix merge mistake
yet one more replacement run
Diffstat (limited to 'ext/standard/proc_open.c')
| -rw-r--r-- | ext/standard/proc_open.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/standard/proc_open.c b/ext/standard/proc_open.c index 2f178d9d99..b8294ed0e9 100644 --- a/ext/standard/proc_open.c +++ b/ext/standard/proc_open.c @@ -19,9 +19,9 @@ #if 0 && (defined(__linux__) || defined(sun) || defined(__IRIX__)) # define _BSD_SOURCE /* linux wants this when XOPEN mode is on */ -# define _BSD_COMPAT /* irix: uint */ +# define _BSD_COMPAT /* irix: uint32_t */ # define _XOPEN_SOURCE 500 /* turn on Unix98 */ -# define __EXTENSIONS__ 1 /* Solaris: uint */ +# define __EXTENSIONS__ 1 /* Solaris: uint32_t */ #endif #include "php.h" @@ -146,7 +146,7 @@ static php_process_env_t _php_array_to_envp(zval *environment, int is_persistent zend_string_release(str); } ZEND_HASH_FOREACH_END(); - assert((uint)(p - env.envp) <= sizeenv); + assert((uint32_t)(p - env.envp) <= sizeenv); zend_hash_destroy(env_hash); FREE_HASHTABLE(env_hash); |