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.h | |
| 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.h')
| -rw-r--r-- | main/php.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/main/php.h b/main/php.h index 2d22297d3a..7b1a9256ba 100644 --- a/main/php.h +++ b/main/php.h @@ -210,7 +210,7 @@ END_EXTERN_C() #endif #ifndef HAVE_SOCKLEN_T -# if PHP_WIN32 +# ifdef PHP_WIN32 typedef int socklen_t; # else typedef unsigned int socklen_t; @@ -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 |