summaryrefslogtreecommitdiff
path: root/cups/ppd-conflicts.c
diff options
context:
space:
mode:
authorMichael R Sweet <michaelrsweet@gmail.com>2016-06-20 15:23:25 -0400
committerMichael R Sweet <michaelrsweet@gmail.com>2016-06-20 15:23:25 -0400
commit8072030b3c862315c367c73663b27f0427325919 (patch)
tree231ed512ca93a46466e7e4e897787053a6dd78fb /cups/ppd-conflicts.c
parent9e5e2ceff5ff91a95f2c62057f4bcb2efb97cbdf (diff)
downloadcups-8072030b3c862315c367c73663b27f0427325919.tar.gz
Update all references to OS X to macOS.
Diffstat (limited to 'cups/ppd-conflicts.c')
-rw-r--r--cups/ppd-conflicts.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/cups/ppd-conflicts.c b/cups/ppd-conflicts.c
index 26e104e92..68e03b4dc 100644
--- 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 */