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

printing/backend/print_backend_cups.cc

Index: printing/backend/print_backend_cups.cc
diff --git a/printing/backend/print_backend_cups.cc b/printing/backend/print_backend_cups.cc
index 9a4cf1cf2c819b4e0080b7acfe43833f32d9fa07..2ca5701e829dda7130b8d13cd3e97ca35679c88b 100644
--- a/printing/backend/print_backend_cups.cc
+++ b/printing/backend/print_backend_cups.cc
@@ -26,11 +26,14 @@
 #include "printing/backend/cups_helper.h"
 #include "printing/backend/print_backend_consts.h"
 
-#if defined(OS_MACOSX)
-#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_5
+#if (defined(OS_MACOSX) && \
+  MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_5) || \
+  (defined(OS_LINUX) && CUPS_VERSION_MAJOR == 1 && \
+  CUPS_VERSION_MINOR < 4)

[Lei Zhang, 2011/09/21 18:47:13]

How about doing a little formatting to line up the conditions so it's more
readable? You don't need the comment on the #endif.

#if (defined(OS_MACOSX) && \
     MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_5) \
    (defined(OS_LINUX) && \
     CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 4)

[chrelad, 2011/09/21 19:07:57]

Done

 const int CUPS_PRINTER_SCANNER = 0x2000000;  // Scanner-only device
-#endif  // MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_5
-#else
+#endif //  (defined(OS_MACOSX) && ...) || (defined(OS_LINUX) && ...)
+
+#if !defined(OS_MACOSX)
 GCRY_THREAD_OPTION_PTHREAD_IMPL;
 
 namespace {
@@ -80,7 +83,7 @@ static base::LazyInstance<GcryptInitializer> g_gcrypt_initializer(
     base::LINKER_INITIALIZED);
 
 }  // namespace
-#endif  // defined(OS_MACOSX)
+#endif  // !defined(OS_MACOSX)
 
 namespace printing {