diff options
| author | Michael R Sweet <michaelrsweet@gmail.com> | 2016-10-20 16:52:11 -0400 |
|---|---|---|
| committer | Michael R Sweet <michaelrsweet@gmail.com> | 2016-10-20 16:52:11 -0400 |
| commit | c7505715caa5f6752a01a408c03388f0bb80075e (patch) | |
| tree | ae9b78243b6fd129ccbdbc6b78c327ba075acb26 | |
| parent | 3af27fc59e0de0feb69356f2d77943c65bdbfbde (diff) | |
Fix builds on systems without a working poll() implementation (Issue #4905)
| -rw-r--r-- | CHANGES.txt | 4 | ||||
| -rw-r--r-- | cups/http-addrlist.c | 4 | ||||
| -rw-r--r-- | xcode/CUPS.xcodeproj/project.pbxproj | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index 36487673d..e2bd1ce0a 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,10 +1,12 @@ -CHANGES.txt - 2.2.2 - 2016-10-17 +CHANGES.txt - 2.2.2 - 2016-10-20 -------------------------------- CHANGES IN CUPS V2.2.2 - The cups-lpd program did not catch all legacy usage of ISO-8859-1 (Issue #4899) + - Fixed builds on systems without a working poll() implementation + (Issue #4905) - Updated localizations (PR #4895, PR #4904) diff --git a/cups/http-addrlist.c b/cups/http-addrlist.c index e9ef53ea4..dd851d4d4 100644 --- a/cups/http-addrlist.c +++ b/cups/http-addrlist.c @@ -312,7 +312,7 @@ httpAddrConnect2( DEBUG_printf(("pfds[%d].revents=%x\n", i, pfds[i].revents)); if (pfds[i].revents && !(pfds[i].revents & (POLLERR | POLLHUP))) # else - if (FD_ISSET(fds[i], &input) && !FD_ISSET(fds[i], &error)) + if (FD_ISSET(fds[i], &input_set) && !FD_ISSET(fds[i], &error_set)) # endif /* HAVE_POLL */ { *sock = fds[i]; @@ -327,7 +327,7 @@ httpAddrConnect2( # ifdef HAVE_POLL else if (pfds[i].revents & (POLLERR | POLLHUP)) # else - else if (FD_ISSET(fds[i], &error)) + else if (FD_ISSET(fds[i], &error_set)) # endif /* HAVE_POLL */ { /* diff --git a/xcode/CUPS.xcodeproj/project.pbxproj b/xcode/CUPS.xcodeproj/project.pbxproj index a94bc2b25..28a97bf52 100644 --- a/xcode/CUPS.xcodeproj/project.pbxproj +++ b/xcode/CUPS.xcodeproj/project.pbxproj @@ -11052,6 +11052,7 @@ ENABLE_TESTABILITY = YES; GCC_PREPROCESSOR_DEFINITIONS = DEBUG; GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES; + GCC_TREAT_WARNINGS_AS_ERRORS = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; @@ -11084,6 +11085,7 @@ CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES; + GCC_TREAT_WARNINGS_AS_ERRORS = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; |