Merge pull request #5212 from albert-astals-cid-kdab/master

Remove unused _PPD_NORMAL_CONSTRAINTS enum

diff --combined cups/ppd-conflicts.c
index ff4d0570d3321b2de854494db9164dded88da699,4633603cbb05a7b0f1fe6046f61be469ea1f68a5..30af8bf780aad264746a5cb28fde7005563ef531
--- 1/cups/ppd-conflicts.c
--- 2/cups/ppd-conflicts.c
+++ b/cups/ppd-conflicts.c
@@@ -24,7 -24,6 +24,6 @@@
  
  enum
  {
-   _PPD_NORMAL_CONSTRAINTS,
    _PPD_OPTION_CONSTRAINTS,
    _PPD_INSTALLABLE_CONSTRAINTS,
    _PPD_ALL_CONSTRAINTS
@@@ -993,7 -992,7 +992,7 @@@ ppd_test_constraints
      if (!consts->installable && which == _PPD_INSTALLABLE_CONSTRAINTS)
        continue;                               /* Skip non-installable option constraint */
  
 -    if (which == _PPD_OPTION_CONSTRAINTS && option)
 +    if ((which == _PPD_OPTION_CONSTRAINTS || which == _PPD_INSTALLABLE_CONSTRAINTS) && option)
      {
       /*
        * Skip constraints that do not involve the current option...