From: Gustavo Lopes <glopes@nebm.ist.utl.pt>
Date: Sat, 2 Feb 2013 15:40:25 +0000 (+0100)
Subject: Merge branch 'sendrecvmsg_rebase_55' into PHP-5.5
X-Git-Tag: php-5.5.0alpha5~43^2~11
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b11777ca2aea339430dfc70d352ef4b994450189;p=php

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
  ...
---

b11777ca2aea339430dfc70d352ef4b994450189
diff --cc ext/sockets/php_sockets.h
index 9c5dc5a4aa,a5699c7514..5082a9bc1e
--- 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