mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-12-15 12:54:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-5.5' into PHP-5.6

Browse Source 
* PHP-5.5:
  - Fixed bug #66381 (__ss_family was changed on AIX 5.3)
This commit is contained in:
Felipe Pena 2014-01-01 09:56:49 -02:00
commit 37897e258d
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ext/sockets/php_sockets.h
View File

@ -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
/*

3
ext/sockets/sockets.c
View File

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