Merge branch 'PHP-7.0'

* PHP-7.0:
  This is exported at implementation site, but no forward declaration can cause compile warnings
This commit is contained in:
Joe Watkins 2016-05-29 06:03:33 +01:00
commit 2a0261d712

View file

@ -318,6 +318,8 @@ PHPAPI int php_network_parse_network_address_with_port(const char *addr,
zend_long addrlen, struct sockaddr *sa, socklen_t *sl); zend_long addrlen, struct sockaddr *sa, socklen_t *sl);
PHPAPI struct hostent* php_network_gethostbyname(char *name); PHPAPI struct hostent* php_network_gethostbyname(char *name);
PHPAPI int php_set_sock_blocking(php_socket_t socketd, int block);
END_EXTERN_C() END_EXTERN_C()
#define php_stream_sock_open_from_socket(socket, persistent) _php_stream_sock_open_from_socket((socket), (persistent) STREAMS_CC) #define php_stream_sock_open_from_socket(socket, persistent) _php_stream_sock_open_from_socket((socket), (persistent) STREAMS_CC)