Commit: b11777ca2aea339430dfc70d352ef4b994450189 Author: Gustavo Lopes <glo...@nebm.ist.utl.pt> Sat, 2 Feb 2013 16:40:25 +0100 Parents: ac47448abb477be99963f0b38fe82ffe78c21a8b e2fc17c833c5122327438c82fc0dc4b689268f59 Branches: PHP-5.5 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=b11777ca2aea339430dfc70d352ef4b994450189 Log: Merge branch 'sendrecvmsg_rebase_55' into PHP-5.5 * sendrecvmsg_rebase_55: (31 commits) Fix multicast.c not defining errno on Windows Fix non-Windows build send/recvmsg() support for Windows Remove some pre-vista code Revert "Payload of HOPLIMIT/TCLASS are 8-bit" Ensure memory is initialized Payload of HOPLIMIT/TCLASS are 8-bit Fix buf in string -> int conv. Build fixes; accept names for if_index Refactoring: move stuff to new conversions.c Support sticky IPV6_PKTINFO Rename some functions for consistency Destroy ancillary registry on shutdown Move some multicast stuff to multicast.c Fix mcast_ipv6_send test Check return of fstat() Fix build on Mac OS X Register extra MSG_* constants Add test for CMSG_RIGHTS Add test for CMSG_CREDENTIALS message ... Changed paths: MM ext/sockets/php_sockets.h Diff: diff --cc ext/sockets/php_sockets.h index 9c5dc5a,a5699c7..5082a9b --- a/ext/sockets/php_sockets.h +++ b/ext/sockets/php_sockets.h @@@ -85,6 -87,23 +87,17 @@@ ZEND_END_MODULE_GLOBALS(sockets #define SOCKETS_G(v) (sockets_globals.v) #endif + ZEND_EXTERN_MODULE_GLOBALS(sockets); + + enum sockopt_return { + SOCKOPT_ERROR, + SOCKOPT_CONTINUE, + SOCKOPT_SUCCESS + }; + + char *sockets_strerror(int error TSRMLS_DC); + php_socket *socket_import_file_descriptor(PHP_SOCKET sock TSRMLS_DC); + -#define PHP_SOCKET_ERROR(socket,msg,errn) \ - socket->error = errn; \ - SOCKETS_G(last_error) = errn; \ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s [%d]: %s", msg, errn, \ - sockets_strerror(errn TSRMLS_CC)) - #else #define phpext_sockets_ptr NULL #endif -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
