diff options
| author | Xinchen Hui <laruence@gmail.com> | 2017-04-10 14:41:48 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2017-04-10 14:41:48 +0800 |
| commit | 8277111eee65521521783fe5c2373f8a40b4daab (patch) | |
| tree | 54f90b1fe9e26be22ff931da4c686b4f75406dc8 /main/php.h | |
| parent | 1b6f784dd6cbcc8c8f93a0c647948dedf09ad070 (diff) | |
| parent | 66411ee62ee8bd5e015c901092014dd9229fca01 (diff) | |
| download | php-git-8277111eee65521521783fe5c2373f8a40b4daab.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
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 1da67b2909..c138e5c0fa 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; |