diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-03-04 21:55:46 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-03-05 15:36:47 +0100 |
| commit | e9975ecffcd32abbffade50124e9935521043e6f (patch) | |
| tree | c7ae05bd799a6d19911dec6c0c1cee9b9a0c89b6 /sal | |
| parent | 8bb33cb289e02012985a8db9ab2dc21efcbcd24e (diff) | |
sal,sd: use newer InetPtonW API when not building for WinXP target
... i.e. decide based on target instead of SDK version.
Change-Id: I225588d34f961c19e223ed9c1b9a934cd5196cf7
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/osl/w32/socket.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sal/osl/w32/socket.cxx b/sal/osl/w32/socket.cxx index 25eec51bc484..88d0c4e1afee 100644 --- a/sal/osl/w32/socket.cxx +++ b/sal/osl/w32/socket.cxx @@ -585,7 +585,7 @@ oslSocketAddr SAL_CALL osl_createInetBroadcastAddr ( if (strDottedAddr && strDottedAddr->length) { // the Win32 SDK 8.1 deprecates inet_addr() -#ifdef _WIN32_WINNT_WINBLUE +#if _WIN32_WINNT >= _WIN32_WINNT_VISTA IN_ADDR addr; INT ret = InetPtonW(AF_INET, strDottedAddr->buffer, & addr); if (1 == ret) @@ -648,7 +648,7 @@ oslSocketAddr SAL_CALL osl_createInetSocketAddr ( sal_uInt32 Addr; // the Win32 SDK 8.1 deprecates inet_addr() -#ifdef _WIN32_WINNT_WINBLUE +#if _WIN32_WINNT >= _WIN32_WINNT_VISTA IN_ADDR addr; INT ret = InetPtonW(AF_INET, strDottedAddr->buffer, & addr); Addr = ret == 1 ? addr.S_un.S_addr : OSL_INADDR_NONE; |