On Mar 4, 2012, at 7:08 AM, Pierre Joye <paj...@php.net> wrote:

> pajoye                                   Sun, 04 Mar 2012 15:08:12 +0000
> 
> Revision: http://svn.php.net/viewvc?view=revision&revision=323865
> 
> Log:
> - bump minimum version, no more XP/2003

Can you add this to UPGRADING and NEWS?

Chris 

> 
> Changed paths:
>    U   php/php-src/trunk/main/network.c
>    U   php/php-src/trunk/win32/build/config.w32.h.in
>    U   php/php-src/trunk/win32/inet.c
>    U   php/php-src/trunk/win32/inet.h
>    U   php/php-src/trunk/win32/sendmail.c
> 
> Modified: php/php-src/trunk/main/network.c
> ===================================================================
> --- php/php-src/trunk/main/network.c    2012-03-04 14:57:07 UTC (rev 323864)
> +++ php/php-src/trunk/main/network.c    2012-03-04 15:08:12 UTC (rev 323865)
> @@ -25,7 +25,10 @@
> 
> #include <stddef.h>
> 
> +
> +
> #ifdef PHP_WIN32
> +# include <Ws2tcpip.h>
> # include "win32/inet.h"
> # define O_RDONLY _O_RDONLY
> # include "win32/param.h"
> 
> Modified: php/php-src/trunk/win32/build/config.w32.h.in
> ===================================================================
> --- php/php-src/trunk/win32/build/config.w32.h.in    2012-03-04 14:57:07 UTC 
> (rev 323864)
> +++ php/php-src/trunk/win32/build/config.w32.h.in    2012-03-04 15:08:12 UTC 
> (rev 323865)
> @@ -6,8 +6,8 @@
> /* Define the minimum supported version */
> #undef _WIN32_WINNT
> #undef NTDDI_VERSION
> -#define _WIN32_WINNT 0x502
> -#define NTDDI_VERSION  _WIN32_WIN2K
> +#define _WIN32_WINNT 0x0600
> +#define NTDDI_VERSION  0x06000100
> 
> /* Default PHP / PEAR directories */
> #define PHP_CONFIG_FILE_PATH (getenv("SystemRoot"))?getenv("SystemRoot"):""
> 
> Modified: php/php-src/trunk/win32/inet.c
> ===================================================================
> --- php/php-src/trunk/win32/inet.c    2012-03-04 14:57:07 UTC (rev 323864)
> +++ php/php-src/trunk/win32/inet.c    2012-03-04 15:08:12 UTC (rev 323865)
> @@ -1,12 +1,13 @@
> #include "config.w32.h"
> -#if (_WIN32_WINNT < 0x0600) /* Vista/2k8 have these functions */
> #include "php.h"
> #include <winsock2.h>
> #include <windows.h>
> #include <Ws2tcpip.h>
> 
> #include "inet.h"
> +#if (_WIN32_WINNT < 0x0600) /* Vista/2k8 have these functions */
> 
> +
> PHPAPI int inet_pton(int af, const char* src, void* dst)
> {
>    int address_length;
> @@ -76,6 +77,8 @@
>    return NULL;
> }
> 
> +#endif
> +
> int inet_aton(const char *cp, struct in_addr *inp) {
>   inp->s_addr = inet_addr(cp);
> 
> @@ -85,4 +88,3 @@
> 
>   return 1;
> }
> -#endif
> 
> Modified: php/php-src/trunk/win32/inet.h
> ===================================================================
> --- php/php-src/trunk/win32/inet.h    2012-03-04 14:57:07 UTC (rev 323864)
> +++ php/php-src/trunk/win32/inet.h    2012-03-04 15:08:12 UTC (rev 323865)
> @@ -6,5 +6,6 @@
> #if (_WIN32_WINNT <= 0x502)
> PHPAPI int inet_pton(int af, const char* src, void* dst);
> PHPAPI const char* inet_ntop(int af, const void* src, char* dst, size_t size);
> +#endif
> +
> PHPAPI int inet_aton(const char *cp, struct in_addr *inp);
> -#endif
> 
> Modified: php/php-src/trunk/win32/sendmail.c
> ===================================================================
> --- php/php-src/trunk/win32/sendmail.c    2012-03-04 14:57:07 UTC (rev 323864)
> +++ php/php-src/trunk/win32/sendmail.c    2012-03-04 15:08:12 UTC (rev 323865)
> @@ -25,6 +25,7 @@
> #ifndef NETWARE
> #include <winsock2.h>
> #include "time.h"
> +# include <Ws2tcpip.h>
> #else    /* NETWARE */
> #include <netware/sendmail_nw.h>
> #endif    /* NETWARE */
> 
> -- 
> PHP CVS Mailing List (http://www.php.net/)
> To unsubscribe, visit: http://www.php.net/unsub.php

--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to