diff options
| author | Xinchen Hui <laruence@gmail.com> | 2017-04-10 14:49:13 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2017-04-10 14:49:13 +0800 |
| commit | 696bd37e6757d77dc7ed44f3ea6451944ebaba96 (patch) | |
| tree | 94fcb38264a7103e7fc5892d155006c5306da68b /main/php.h | |
| parent | 4e9f0a80b9748c03e7bae6339ec051b815f5a569 (diff) | |
| parent | 9398f15efd58899df21f5e0cf032b8881fe71f3f (diff) | |
| download | php-git-696bd37e6757d77dc7ed44f3ea6451944ebaba96.tar.gz | |
Merge branch 'PHP-7.1'
* PHP-7.1:
Fixed condition check
Fixed condition check
another place
Conflicts:
ext/mcrypt/mcrypt.c
Diffstat (limited to 'main/php.h')
| -rw-r--r-- | main/php.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/php.h b/main/php.h index 73362eb744..7b1a9256ba 100644 --- a/main/php.h +++ b/main/php.h @@ -323,7 +323,7 @@ END_EXTERN_C() #define STR_PRINT(str) ((str)?(str):"") #ifndef MAXPATHLEN -# if PHP_WIN32 +# ifdef PHP_WIN32 # include "win32/ioutil.h" # define MAXPATHLEN PHP_WIN32_IOUTIL_MAXPATHLEN # elif PATH_MAX |