*** ./ext/sockets/conversions.c.ORIG	Sat Jan 16 01:44:20 2016
--- ./ext/sockets/conversions.c	Sat Jan 16 01:44:51 2016
***************
*** 24,29 ****
--- 24,38 ----
  #include <stdarg.h>
  #include <stddef.h>
  
+ 
+ #ifndef CMSG_SPACE
+ #define CMSG_SPACE(len) (_CMSG_ALIGN(sizeof(struct cmsghdr)) + _CMSG_ALIGN(len))
+ #endif
+ #ifndef CMSG_LEN
+ #define CMSG_LEN(len) (_CMSG_ALIGN(sizeof(struct cmsghdr)) + (len))
+ #endif
+ 
+ 
  #ifdef PHP_WIN32
  typedef unsigned short sa_family_t;
  # define msghdr			_WSAMSG
*** ./ext/sockets/sendrecvmsg.c.ORIG	Sat Jan 16 01:45:07 2016
--- ./ext/sockets/sendrecvmsg.c	Sat Jan 16 01:45:25 2016
***************
*** 30,35 ****
--- 30,41 ----
  #define DEFAULT_BUFF_SIZE 8192
  #define MAX_ARRAY_KEY_SIZE 128
  
+ 
+ #ifndef CMSG_SPACE
+ #define CMSG_SPACE(len) (_CMSG_ALIGN(sizeof(struct cmsghdr)) + _CMSG_ALIGN(len))
+ #endif
+ 
+ 
  #ifdef PHP_WIN32
  #include "windows_common.h"
  #include <Mswsock.h>
*** ./Zend/zend_types.h.ORIG	Fri Dec  2 10:30:09 2016
--- ./Zend/zend_types.h	Fri Dec  2 10:31:05 2016
***************
*** 65,70 ****
--- 65,78 ----
  # endif
  #endif
  
+ #ifndef SIZE_MAX
+ # if (__64BIT__)
+ #  define SIZE_MAX        UINT64_MAX
+ # else
+ #  define SIZE_MAX        UINT32_MAX
+ # endif
+ #endif
+ 
  typedef intptr_t zend_intptr_t;
  typedef uintptr_t zend_uintptr_t;
  
*** ./main/php.h.ORIG	Fri Dec  2 10:14:55 2016
--- ./main/php.h	Fri Dec  2 10:16:16 2016
***************
*** 231,236 ****
--- 231,244 ----
  #define INT_MIN (- INT_MAX - 1)
  #endif
  
+ #ifndef SIZE_MAX
+ # if (__64BIT__)
+ #  define SIZE_MAX        UINT64_MAX
+ # else
+ #  define SIZE_MAX        UINT32_MAX
+ # endif
+ #endif
+ 
  #define PHP_GCC_VERSION ZEND_GCC_VERSION
  #define PHP_ATTRIBUTE_MALLOC ZEND_ATTRIBUTE_MALLOC
  #define PHP_ATTRIBUTE_FORMAT ZEND_ATTRIBUTE_FORMAT
*** ./ext/gd/libgd/gd.c.ORIG	Sat Dec 16 16:28:05 2017
--- ./ext/gd/libgd/gd.c	Sat Dec 16 16:31:51 2017
***************
*** 7,12 ****
--- 7,16 ----
  
  #include "php.h"
  
+ #if defined(_AIX) && !defined(_AIX52)
+ # define HAVE_FLOORF 0
+ #endif
+ 
  #ifdef _MSC_VER
  # if _MSC_VER >= 1300
  /* in MSVC.NET these are available but only for __cplusplus and not _MSC_EXTENSIONS */
*** ./ext/gd/libgd/gd_interpolation.c.ORIG	Sat Dec 16 16:29:40 2017
--- ./ext/gd/libgd/gd_interpolation.c	Sat Dec 16 16:30:27 2017
***************
*** 2232,2237 ****
--- 2232,2241 ----
  	return dst;
  }
  
+ #if defined(_AIX) && !defined(_AIX52)
+ # define floorf(x) ((float)(floor(x)))
+ #endif
+ 
  gdImagePtr gdImageRotateInterpolated(const gdImagePtr src, const float angle, int bgcolor)
  {
  	/* round to two decimals and keep the 100x multiplication to use it in the common square angles 
*** ./Zend/zend_long.h.ORIG	Tue Nov 13 13:58:15 2018
--- ./Zend/zend_long.h	Tue Nov 13 18:12:47 2018
***************
*** 75,81 ****
  		int st = snprintf((s), (len), ZEND_LONG_FMT, (i)); \
  		(s)[st] = '\0'; \
   	} while (0)
! #  define ZEND_ATOL(i, s) (i) = atoll((s))
  #  define ZEND_STRTOL(s0, s1, base) strtoll((s0), (s1), (base))
  #  define ZEND_STRTOUL(s0, s1, base) strtoull((s0), (s1), (base))
  #  define ZEND_STRTOL_PTR strtoll
--- 75,85 ----
  		int st = snprintf((s), (len), ZEND_LONG_FMT, (i)); \
  		(s)[st] = '\0'; \
   	} while (0)
! #  if defined(_AIX) && !defined(_AIX52)
! #   define ZEND_ATOL(i, s) (i) = strtoll(s, (char **)NULL, 10)
! #  else
! #   define ZEND_ATOL(i, s) (i) = atoll((s))
! #  endif
  #  define ZEND_STRTOL(s0, s1, base) strtoll((s0), (s1), (base))
  #  define ZEND_STRTOUL(s0, s1, base) strtoull((s0), (s1), (base))
  #  define ZEND_STRTOL_PTR strtoll
*** ./ext/posix/posix.c.ORIG	Tue Nov 13 13:59:48 2018
--- ./ext/posix/posix.c	Tue Nov 13 14:00:48 2018
***************
*** 1398,1403 ****
--- 1398,1414 ----
  	if (zend_parse_parameters(ZEND_NUM_ARGS(), "lll", &res, &cur, &max) == FAILURE) {
  		RETURN_FALSE;
  	}
+ #if defined(_AIX)
+ 	/*
+ 	On AIX, when cur > max setrlimit returns 0 and sets softlimit and hardlimit to max,
+ 	instead of returning -1, so we need to check the values to reproduce the same behavior
+ 	as setrlimit on Linux.
+ 	*/
+ 	if (cur > max) {
+ 	    POSIX_G(last_error) = EINVAL;
+ 	    RETURN_FALSE;
+ 	}
+ #endif
  
  	rl.rlim_cur = cur;
  	rl.rlim_max = max;
*** ./ext/soap/tests/bugs/bug29109.wsdl.ORIG	Tue Nov 13 17:04:06 2018
--- ./ext/soap/tests/bugs/bug29109.wsdl	Tue Nov 13 17:04:29 2018
***************
*** 1,4 ****
! <?xml version="1.0" encoding="windows-1257"?>
  <definitions xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/"
  xmlns:s0="http://tempuri.org/"
  xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
--- 1,4 ----
! <?xml version="1.0" encoding="iso-8859-13"?>
  <definitions xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/"
  xmlns:s0="http://tempuri.org/"
  xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
*** ./ext/standard/array.c.ORIG	Tue Nov 13 13:50:52 2018
--- ./ext/standard/array.c	Tue Nov 13 13:52:33 2018
***************
*** 3516,3521 ****
--- 3516,3528 ----
  }
  /* }}} */
  
+ #ifndef imaxabs
+ intmax_t imaxabs(intmax_t x)
+ {
+   return (x < 0 ? -x : x);
+ }
+ #endif
+ 
  /* {{{ proto array array_pad(array input, int pad_size, mixed pad_value)
     Returns a copy of input array padded with pad_value to size pad_size */
  PHP_FUNCTION(array_pad)
*** ./ext/standard/basic_functions.c.ORIG	Tue Nov 13 15:53:22 2018
--- ./ext/standard/basic_functions.c	Tue Nov 13 15:54:31 2018
***************
*** 3958,3963 ****
--- 3958,3974 ----
  	if (addr_len == 0 || inet_pton(AF_INET, addr, &ip) != 1) {
  		RETURN_FALSE;
  	}
+ #ifdef _AIX
+ 	/*
+ 	AIX accepts IP strings with excedentary 0 (192.168.042.42 will be treated as
+ 	192.168.42.42), while Linux don't.
+ 	For consistency, we convert back the IP to a string and check if it is equal to
+ 	the original string. If not, the IP should be considered invalid.
+ dw	+	*/
+ 	if (strcmp(addr, inet_ntoa(ip)) != 0) {
+ 	    RETURN_FALSE;
+ 	}
+ #endif
  	RETURN_LONG(ntohl(ip.s_addr));
  #else
  	if (addr_len == 0 || (ip = inet_addr(addr)) == INADDR_NONE) {