summaryrefslogtreecommitdiff
path: root/ext/sockets/php_sockets.h
diff options
context:
space:
mode:
authorFelipe Pena <felipensp@gmail.com>2014-01-01 09:56:49 -0200
committerFelipe Pena <felipensp@gmail.com>2014-01-01 09:56:49 -0200
commit37897e258d13016f80c61b7d6e9054994f2e5e0f (patch)
treefa2c276afeda390f4440abfb95bcf264e0a2d33b /ext/sockets/php_sockets.h
parent5408f1e5a68fead0057c95df57cfb1ff0cc3fe81 (diff)
parent49cdde7326c50a5861a0446d6c6647838447595a (diff)
downloadphp-git-37897e258d13016f80c61b7d6e9054994f2e5e0f.tar.gz
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5: - Fixed bug #66381 (__ss_family was changed on AIX 5.3)
Diffstat (limited to 'ext/sockets/php_sockets.h')
-rw-r--r--ext/sockets/php_sockets.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/ext/sockets/php_sockets.h b/ext/sockets/php_sockets.h
index 17abf95a19..d4830199bc 100644
--- a/ext/sockets/php_sockets.h
+++ b/ext/sockets/php_sockets.h
@@ -109,6 +109,10 @@ php_socket *socket_import_file_descriptor(PHP_SOCKET sock TSRMLS_DC);
#define phpext_sockets_ptr NULL
#endif
+#if defined(_AIX) && !defined(HAVE_SA_SS_FAMILY)
+# define ss_family __ss_family
+#endif
+
#endif
/*