Fix builds on systems without a working poll() implementation (Issue #4905)

diff --git a/CHANGES.txt b/CHANGES.txt
index 36487673d33f06b4d1a36bbadcc019b1d6095175..e2bd1ce0a0fcd8d565ff4a9531b7d3eb99e06420 100644 (file)
--- 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 e9ef53ea43e91c6d8c388c00e3d9a0cd4d535dba..dd851d4d4b55d72726dcaf90d907af13f6d90a2d 100644 (file)
--- 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 a94bc2b25f90a130200c60e9870285a758602d97..28a97bf52f776ee7293013cd4b0ea04d81f74530 100644 (file)
--- 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;