com php-src: - Fixed bug #66381 (__ss_family was ch anged on AIX 5.3): ext/sockets/php_sockets .h ext/sockets/sockets.c
| From: | Felipe Pena | Date: | Wed, 01 Jan 2014 11:55:14 +0000 |
| Subject: | com php-src: - Fixed bug #66381 (__ss_family was ch anged on AIX 5.3): ext/sockets/php_sockets .h ext/sockets/sockets.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-75516@lists.php.net to get a copy of this message | ||
Commit: 5967fb194f435aa888fd75c31cfb74ffce14ffd3
Author: Felipe Pena <felipensp@gmail.com> Wed, 1 Jan 2014 09:55:14 -0200
Parents: 3f7a145b5abd66d1c77e65060d15702db4d36529
Branches: PHP-5.5 PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=5967fb194f435aa888fd75c31cfb74ffce14ffd3
Log:
- Fixed bug #66381 (__ss_family was changed on AIX 5.3)
Bugs:
https://bugs.php.net/66381
Changed paths:
M ext/sockets/php_sockets.h
M ext/sockets/sockets.c
Diff:
diff --git a/ext/sockets/php_sockets.h b/ext/sockets/php_sockets.h
index 17abf95..d483019 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
/*
diff --git a/ext/sockets/sockets.c b/ext/sockets/sockets.c
index 4a2a41b..eef1d42 100644
--- a/ext/sockets/sockets.c
+++ b/ext/sockets/sockets.c
@@ -56,9 +56,6 @@
# define IS_INVALID_SOCKET(a) (a->bsd_socket < 0)
# define set_errno(a) (errno = a)
# include "php_sockets.h"
-# if defined(_AIX) && !defined(HAVE_SA_SS_FAMILY)
-# define ss_family __ss_family
-# endif
# if HAVE_IF_NAMETOINDEX
# include <net/if.h>
# endif