Update all references to OS X to macOS.

[thirdparty/cups.git] / cups / ppd-conflicts.c

diff --git a/cups/ppd-conflicts.c b/cups/ppd-conflicts.c
index 26e104e9201f2e326cf179b8a89641720486fe24..68e03b4dcdb7639a682fcd8971e4472c25b45acd 100644 (file)
--- a/cups/ppd-conflicts.c
+++ b/cups/ppd-conflicts.c
@@ -63,7 +63,7 @@ static cups_array_t   *ppd_test_constraints(ppd_file_t *ppd,
  * the conflicting options.  The returned option array must be freed using
  * @link cupsFreeOptions@.
  *
- * @since CUPS 1.4/OS X 10.6@
+ * @since CUPS 1.4/macOS 10.6@
  */
 
 int                                    /* O - Number of conflicting options */
@@ -162,7 +162,7 @@ cupsGetConflicts(
  * choice for the conflicting option, then iterating over all possible choices
  * until a non-conflicting option choice is found.
  *
- * @since CUPS 1.4/OS X 10.6@
+ * @since CUPS 1.4/macOS 10.6@
  */
 
 int                                    /* O  - 1 on success, 0 on failure */
@@ -634,7 +634,7 @@ ppdConflicts(ppd_file_t *ppd)               /* I - PPD to check */
  * This function tests whether a particular option choice is available based
  * on constraints against options in the "InstallableOptions" group.
  *
- * @since CUPS 1.4/OS X 10.6@
+ * @since CUPS 1.4/macOS 10.6@
  */
 
 int                                    /* O - 1 if conflicting, 0 if not conflicting */