diff options
| author | Joe Watkins <krakjoe@php.net> | 2017-04-10 08:07:24 +0100 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2017-04-10 08:07:24 +0100 |
| commit | e6423757645749dca781639d815f8348a4a20c98 (patch) | |
| tree | f9374fdad62f0e288a83be1abd7a5892d63532de /main/php.h | |
| parent | 60b68f19f0618c884b9d97da79bd0b5c06c35072 (diff) | |
| parent | 4bebcb84ad47e687fc3ef3a01b875aa04dfb72d0 (diff) | |
| download | php-git-e6423757645749dca781639d815f8348a4a20c98.tar.gz | |
Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0
* 'PHP-7.0' of git.php.net:/php-src:
Fixed condition check
Fixed issue #2466 Invalid integer constant expression error in php.h
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 4b40132adb..25fffee714 100644 --- a/main/php.h +++ b/main/php.h @@ -143,7 +143,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; |