diff options
| author | Adam Harvey <aharvey@php.net> | 2013-01-16 10:19:13 +0800 |
|---|---|---|
| committer | Adam Harvey <aharvey@php.net> | 2013-01-16 10:19:13 +0800 |
| commit | 77010bf9bf45c46d844b336c18cc8102cfc7e249 (patch) | |
| tree | 53fc3ffdda02528c658517d360904afa9b3769ab /sapi | |
| parent | 2f7aafe9929d843ae089a7072c5e6d9bd70c77ae (diff) | |
| parent | 142c40f32c075a8eb706f2e630b934f39e711b70 (diff) | |
| download | php-git-77010bf9bf45c46d844b336c18cc8102cfc7e249.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Update the arguments in the prototype of fpm_socket_unix_test_connect().
Diffstat (limited to 'sapi')
| -rw-r--r-- | sapi/fpm/fpm/fpm_sockets.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sapi/fpm/fpm/fpm_sockets.h b/sapi/fpm/fpm/fpm_sockets.h index 499ba6baf8..cce5712b8c 100644 --- a/sapi/fpm/fpm/fpm_sockets.h +++ b/sapi/fpm/fpm/fpm_sockets.h @@ -25,7 +25,7 @@ enum fpm_address_domain fpm_sockets_domain_from_address(char *addr); int fpm_sockets_init_main(); int fpm_socket_get_listening_queue(int sock, unsigned *cur_lq, unsigned *max_lq); -int fpm_socket_unix_test_connect(struct sockaddr_un *sun, size_t socklen); +int fpm_socket_unix_test_connect(struct sockaddr_un *sock, size_t socklen); static inline int fd_set_blocked(int fd, int blocked) /* {{{ */ |