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 /ext/sockets/multicast.c | |
| 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 'ext/sockets/multicast.c')
| -rw-r--r-- | ext/sockets/multicast.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/sockets/multicast.c b/ext/sockets/multicast.c index 9f8bb6b959..24f374c55d 100644 --- a/ext/sockets/multicast.c +++ b/ext/sockets/multicast.c @@ -627,7 +627,7 @@ static int _php_source_op_to_ipv4_op(enum source_op sop) #endif /* HAS_MCAST_EXT */ -#if PHP_WIN32 +#ifdef PHP_WIN32 int php_if_index_to_addr4(unsigned if_index, php_socket *php_sock, struct in_addr *out_addr) { MIB_IPADDRTABLE *addr_table; |