diff options
| author | Joe Watkins <krakjoe@php.net> | 2017-04-10 08:06:52 +0100 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2017-04-10 08:06:52 +0100 |
| commit | e24dcf97f1af7165d14ff3f57f21c7c89225e1f7 (patch) | |
| tree | 60abfccec76ba16ad9c3a8b06847d0e254db214a /main/php_ini.c | |
| parent | 5b013e7935efb73e27ebc7d40dce7ef9a3644b14 (diff) | |
| parent | 696bd37e6757d77dc7ed44f3ea6451944ebaba96 (diff) | |
| download | php-git-e24dcf97f1af7165d14ff3f57f21c7c89225e1f7.tar.gz | |
Merge branch 'master' of git.php.net:/php-src
* 'master' of git.php.net:/php-src:
Fixed condition check
Fixed condition check
another place
Fixed issue #2466 Invalid integer constant expression error in php.h
Diffstat (limited to 'main/php_ini.c')
| -rw-r--r-- | main/php_ini.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/main/php_ini.c b/main/php_ini.c index 3841e53eb4..55a083b18c 100644 --- a/main/php_ini.c +++ b/main/php_ini.c @@ -804,11 +804,11 @@ PHPAPI void php_ini_activate_per_dir_config(char *path, size_t path_len) zval *tmp2; char *ptr; -#if PHP_WIN32 +#ifdef PHP_WIN32 char path_bak[MAXPATHLEN]; #endif -#if PHP_WIN32 +#ifdef PHP_WIN32 /* MAX_PATH is \0-terminated, path_len == MAXPATHLEN would overrun path_bak */ if (path_len >= MAXPATHLEN) { #else @@ -817,7 +817,7 @@ PHPAPI void php_ini_activate_per_dir_config(char *path, size_t path_len) return; } -#if PHP_WIN32 +#ifdef PHP_WIN32 memcpy(path_bak, path, path_len); path_bak[path_len] = 0; TRANSLATE_SLASHES_LOWER(path_bak); |