*** ./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 #include + + #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 *** ./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