Commit 61e08bae authored by Matthias Clasen's avatar Matthias Clasen

Merge branch 'master' into 'master'

Fix the build with cups < 2.2.12

Closes #2968

See merge request !2744
parents 4661f15f 0493e898
Pipeline #224641 passed with stages
in 60 minutes and 2 seconds
......@@ -647,7 +647,11 @@ add_cups_options (const char *key,
custom_value = TRUE;
break;
#if (CUPS_VERSION_MAJOR >= 3) || \
(CUPS_VERSION_MAJOR == 2 && CUPS_VERSION_MINOR >= 3) || \
(CUPS_VERSION_MAJOR == 2 && CUPS_VERSION_MINOR == 2 && CUPS_VERSION_PATCH >= 12)
case PPD_CUSTOM_UNKNOWN:
#endif
default :
custom_value = FALSE;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment