diff options
| author | chrelad@gmail.com <chrelad@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-22 07:29:38 +0000 |
|---|---|---|
| committer | chrelad@gmail.com <chrelad@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-22 07:29:38 +0000 |
| commit | ef4cdfaf09e67e83107d0ace843155fbc6f5d688 (patch) | |
| tree | f06fd2dbd8e0de7ede6f5aaebb905bbdafdbbe29 /printing | |
| parent | 2b733b3e37e4003a2689d8b131629c98ab3a2e77 (diff) | |
| download | chromium_src-ef4cdfaf09e67e83107d0ace843155fbc6f5d688.zip chromium_src-ef4cdfaf09e67e83107d0ace843155fbc6f5d688.tar.gz chromium_src-ef4cdfaf09e67e83107d0ace843155fbc6f5d688.tar.bz2 | |
CUPS printing: Define CUPS_PRINTER_SCANNER for Linux if CUPS is < 1.4
BUG=97409
TEST=Try compiling on Linux with CUPS < 1.4
Review URL: http://codereview.chromium.org/7980036
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102248 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'printing')
| -rw-r--r-- | printing/backend/print_backend_cups.cc | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/printing/backend/print_backend_cups.cc b/printing/backend/print_backend_cups.cc index 9a4cf1c..e2c383ee 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) const int CUPS_PRINTER_SCANNER = 0x2000000; // Scanner-only device -#endif // MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_5 -#else +#endif + +#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 { |