diff options
| author | Bryan Ferris <bferris@google.com> | 2019-06-21 10:49:26 -0700 |
|---|---|---|
| committer | Huizi Yang <yanghuiz@google.com> | 2019-10-08 14:05:51 -0700 |
| commit | 2ccb2eaf277e9f184c8225cd80d341d1e70a6d68 (patch) | |
| tree | aedb3a476f3355dd099cf82d961ee2f2a67d51d0 /cups/http-addr.c | |
| parent | 05b0b189a65a1d52cbfa5ae6d35e2a16b201e706 (diff) | |
| download | platform_external_libcups-android-9.0.0_r60.tar.gz platform_external_libcups-android-9.0.0_r60.tar.bz2 platform_external_libcups-android-9.0.0_r60.zip | |
Update libcups to v2.2.9android-9.0.0_r60android-9.0.0_r59android-9.0.0_r58android-9.0.0_r57android-9.0.0_r56android-9.0.0_r55android-9.0.0_r54android-9.0.0_r53android-9.0.0_r52android-9.0.0_r51security-pi-releasepie-security-release
Bug: 111210196
Test: adb shell am instrument -w android.print.cts/androidx.test.runner.AndroidJUnitRunner
Change-Id: I5170f3629dabbfa3af5e5af037261986e7bfe2f6
Merged-In: Iefafb654fcb0764bba0f17731e469db595a6b36e
(cherry picked from commit 5fb2ccdf3347f61b570c8e340f90db5cd28b29bc)
Diffstat (limited to 'cups/http-addr.c')
| -rw-r--r-- | cups/http-addr.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cups/http-addr.c b/cups/http-addr.c index 61c86384..f8b8131c 100644 --- a/cups/http-addr.c +++ b/cups/http-addr.c @@ -69,11 +69,11 @@ int /* O - 0 on success, -1 on failure */ httpAddrClose(http_addr_t *addr, /* I - Listen address or @code NULL@ */ int fd) /* I - Socket file descriptor */ { -#ifdef WIN32 +#ifdef _WIN32 if (closesocket(fd)) #else if (close(fd)) -#endif /* WIN32 */ +#endif /* _WIN32 */ return (-1); #ifdef AF_LOCAL @@ -258,9 +258,9 @@ httpAddrListen(http_addr_t *addr, /* I - Address to bind to */ * Close on exec... */ -#ifndef WIN32 +#ifndef _WIN32 fcntl(fd, F_SETFD, fcntl(fd, F_GETFD) | FD_CLOEXEC); -#endif /* !WIN32 */ +#endif /* !_WIN32 */ #ifdef SO_NOSIGPIPE /* |