svn: /php/php-src/ branches/PHP_5_4/ext/sockets/sockets.c trunk/ext/sockets/sockets.c
| From: | Gustavo André dos Santos Lopes | Date: | Sat, 02 Jul 2011 12:03:32 +0000 |
| Subject: | svn: /php/php-src/ branches/PHP_5_4/ext/sockets/sockets.c trunk/ext/sockets/sockets.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-65390@lists.php.net to get a copy of this message | ||
cataphract Sat, 02 Jul 2011 12:03:32 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=312810
Log:
- Fixed bug #55111 (sockets extension fails to compile on Mac OSX).
Bug: https://bugs.php.net/55111 (Assigned) Make fails with
--enable-sockets
Changed paths:
U php/php-src/branches/PHP_5_4/ext/sockets/sockets.c
U php/php-src/trunk/ext/sockets/sockets.c
Modified: php/php-src/branches/PHP_5_4/ext/sockets/sockets.c
===================================================================
--- php/php-src/branches/PHP_5_4/ext/sockets/sockets.c 2011-07-02 09:50:18 UTC (rev 312809)
+++ php/php-src/branches/PHP_5_4/ext/sockets/sockets.c 2011-07-02 12:03:32 UTC (rev 312810)
@@ -2202,11 +2202,13 @@
else if (level == IPPROTO_IPV6) {
switch (optname) {
case MCAST_JOIN_GROUP:
- case MCAST_LEAVE_GROUP:
+ case MCAST_LEAVE_GROUP:
+#ifdef HAS_MCAST_EXT
case MCAST_BLOCK_SOURCE:
case MCAST_UNBLOCK_SOURCE:
case MCAST_JOIN_SOURCE_GROUP:
case MCAST_LEAVE_SOURCE_GROUP:
+#endif
if (php_do_mcast_opt(php_sock, level, optname, arg4 TSRMLS_CC) == FAILURE) {
RETURN_FALSE;
} else {
Modified: php/php-src/trunk/ext/sockets/sockets.c
===================================================================
--- php/php-src/trunk/ext/sockets/sockets.c 2011-07-02 09:50:18 UTC (rev 312809)
+++ php/php-src/trunk/ext/sockets/sockets.c 2011-07-02 12:03:32 UTC (rev 312810)
@@ -2202,11 +2202,13 @@
else if (level == IPPROTO_IPV6) {
switch (optname) {
case MCAST_JOIN_GROUP:
- case MCAST_LEAVE_GROUP:
+ case MCAST_LEAVE_GROUP:
+#ifdef HAS_MCAST_EXT
case MCAST_BLOCK_SOURCE:
case MCAST_UNBLOCK_SOURCE:
case MCAST_JOIN_SOURCE_GROUP:
case MCAST_LEAVE_SOURCE_GROUP:
+#endif
if (php_do_mcast_opt(php_sock, level, optname, arg4 TSRMLS_CC) == FAILURE) {
RETURN_FALSE;
} else {