Merge branch 'PHP-5.5'

laruence · laruence · commit ac2376fbf134 · 2013-03-05T14:03:47.000+08:00
diff --git a/ext/sockets/php_sockets.h b/ext/sockets/php_sockets.h
@@ -28,10 +28,6 @@
 # include "config.h"
 #endif
 
-#ifdef __APPLE__
-#define __APPLE_USE_RFC_3542
-#endif
-
 #if HAVE_SOCKETS
 
 #include <php.h>
diff --git a/ext/sockets/tests/socket_set_option_error_socket_option.phpt b/ext/sockets/tests/socket_set_option_error_socket_option.phpt
@@ -3,13 +3,11 @@ Test if socket_set_option() returns 'unable to set socket option' failure for in
 --SKIPIF--
 <?php
 if (!extension_loaded('sockets')) {
-        die('SKIP sockets extension not available.');
+    die('SKIP sockets extension not available.');
 }
-
 if (PHP_OS == 'Darwin') {
-   die('skip Not for OSX');
+    die('skip Not for OSX');
 }
-
 $filename = dirname(__FILE__) . '/006_root_check.tmp';
 $fp = fopen($filename, 'w');
 fclose($fp);
