CUPS printing: Define CUPS_PRINTER_SCANNER for Linux if CUPS is < 1.4

printing/backend/print_backend_cups.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "printing/backend/print_backend.h"
 
 #include "build/build_config.h"
 
 #include <dlfcn.h>
 #include <errno.h>
@@ skipping 64 matching lines @@
       LOG(ERROR) << "Gnutls initialization failed";
   }
 };
 
 static base::LazyInstance<GcryptInitializer> g_gcrypt_initializer(
     base::LINKER_INITIALIZED);
 
 }  // namespace
 #endif  // defined(OS_MACOSX)
 
+// Define CUPS_PRINTER_SCANNER for Linux CUPS < 1.4
+#if defined(OS_LINUX)
+#if CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 4
+const int CUPS_PRINTER_SCANNER = 0x2000000;  // Scanner-only device

[kmadhusu, 2011/09/21 17:15:30]

lines 29-32 declares this variables for OS_MAC. You may want to add this linux
specific code there.

#if defined (USE_CUPS)
#if (defined(OS_LINUX) && CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 4) ||
(defined(OS_MACOSX).....)
    const int CUPS_PRINTER_SCANNER = ...
#endif
#endif

[chrelad, 2011/09/21 17:53:10]

Hmmm, not working well for me due to the 80 character limit. Due to the long
conditional, my wrapping is causing errors like:

printing/backend/print_backend_cups.cc:29:27: error: operator '&&' has no right
operand

Any thoughts on how to get the entire conditional one one line or avoid the
compiler errors?
On 2011/09/21 17:15:30, kmadhusu wrote:

[kmadhusu, 2011/09/21 18:01:50]

Try using line continuation '\' character before the wrap.

Eg:
#if (defined(OS_POSIX) &&                                               \
     defined(ABC) && _POSIX_MONOTONIC_CLOCK >= 0) || \
     defined(OS_FREEBSD) || defined(OS_OPENBSD) || defined(OS_ANDROID)

[Lei Zhang, 2011/09/21 18:22:34]

This is print_backend_cups.cc, you don't need to check USE_CUPS in here. I'd
just put it after line 33. The #else block is effectively POSIX minus MAC.

[chrelad, 2011/09/21 18:25:33]

Done

[chrelad, 2011/09/21 18:30:57]

Huh, okay; well, could you look at the latest version and see if that would
work?
On 2011/09/21 18:22:34, Lei Zhang wrote:

+#endif  // CUPS_VERSION_MINOR < 4
+#endif  // defined(OS_LINUX)
+
 namespace printing {
 
 static const char kCUPSPrinterInfoOpt[] = "printer-info";
 static const char kCUPSPrinterStateOpt[] = "printer-state";
 static const char kCUPSPrinterTypeOpt[] = "printer-type";
 
 class PrintBackendCUPS : public PrintBackend {
  public:
   PrintBackendCUPS(const GURL& print_server_url, bool blocking);
   virtual ~PrintBackendCUPS() {}
@@ skipping 203 matching lines @@
                    << ", HTTP error: " << http_error;
         file_util::Delete(ppd_path, false);
         ppd_path.clear();
       }
     }
   }
   return ppd_path;
 }
 
 }  // namespace printing