From: Michael R Sweet <michaelrsweet@gmail.com>
Date: Mon, 20 Jun 2016 19:27:01 +0000 (-0400)
Subject: CUPS 2.2 is part of macOS 10.12.
X-Git-Tag: v2.2b2~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b2e6c325803d775cee5cf14aa63aed3fa7d1b673;p=thirdparty%2Fcups.git

CUPS 2.2 is part of macOS 10.12.
---

diff --git a/cups/cups.h b/cups/cups.h
index f451166061..7001ba4bc0 100644
--- a/cups/cups.h
+++ b/cups/cups.h
@@ -598,7 +598,7 @@ extern const char	*cupsLocalizeDestMedia(http_t *http, cups_dest_t *dest, cups_d
 extern int		cupsMakeServerCredentials(const char *path, const char *common_name, int num_alt_names, const char **alt_names, time_t expiration_date) _CUPS_API_2_0;
 extern int		cupsSetServerCredentials(const char *path, const char *common_name, int auto_create) _CUPS_API_2_0;
 
-/* New in CUPS 2.2 */
+/* New in CUPS 2.2/macOS 10.12 */
 extern ssize_t		cupsHashData(const char *algorithm, const void *data, size_t datalen, unsigned char *hash, size_t hashsize) _CUPS_API_2_2;
 
 #  ifdef __cplusplus
diff --git a/cups/hash.c b/cups/hash.c
index ca6a69c4c0..6b7b6dadfb 100644
--- a/cups/hash.c
+++ b/cups/hash.c
@@ -36,7 +36,7 @@
  *
  * The returned hash is binary data.
  *
- * @since CUPS 2.2@
+ * @since CUPS 2.2/macOS 10.12@
  */
 
 ssize_t					/* O - Size of hash or -1 on error */
diff --git a/cups/raster.h b/cups/raster.h
index 4a853448cc..43a9d1581b 100644
--- a/cups/raster.h
+++ b/cups/raster.h
@@ -404,7 +404,7 @@ extern const char	*cupsRasterErrorString(void) _CUPS_API_1_3;
 extern cups_raster_t	*cupsRasterOpenIO(cups_raster_iocb_t iocb, void *ctx,
 			                  cups_mode_t mode);
 
-/**** New in CUPS 2.2 ****/
+/**** New in CUPS 2.2/macOS 10.12 ****/
 extern int		cupsRasterInitPWGHeader(cups_page_header2_t *h, pwg_media_t *media, const char *type, int xdpi, int ydpi, const char *sides, const char *sheet_back) _CUPS_API_2_2;
 
 #  ifdef __cplusplus
diff --git a/cups/versioning.h b/cups/versioning.h
index 8d8691bc72..ed68f82f97 100644
--- a/cups/versioning.h
+++ b/cups/versioning.h
@@ -54,6 +54,9 @@
 #    ifndef AVAILABLE_MAC_OS_X_VERSION_10_10_AND_LATER
 #      define AVAILABLE_MAC_OS_X_VERSION_10_10_AND_LATER __attribute__((unavailable))
 #    endif /* !AVAILABLE_MAC_OS_X_VERSION_10_10_AND_LATER */
+#    ifndef AVAILABLE_MAC_OS_X_VERSION_10_12_AND_LATER
+#      define AVAILABLE_MAC_OS_X_VERSION_10_12_AND_LATER __attribute__((unavailable))
+#    endif /* !AVAILABLE_MAC_OS_X_VERSION_10_12_AND_LATER */
 #    define _CUPS_API_1_1_19 AVAILABLE_MAC_OS_X_VERSION_10_3_AND_LATER
 #    define _CUPS_API_1_1_20 AVAILABLE_MAC_OS_X_VERSION_10_4_AND_LATER
 #    define _CUPS_API_1_1_21 AVAILABLE_MAC_OS_X_VERSION_10_4_AND_LATER
@@ -64,7 +67,7 @@
 #    define _CUPS_API_1_6 AVAILABLE_MAC_OS_X_VERSION_10_8_AND_LATER
 #    define _CUPS_API_1_7 AVAILABLE_MAC_OS_X_VERSION_10_9_AND_LATER
 #    define _CUPS_API_2_0 AVAILABLE_MAC_OS_X_VERSION_10_10_AND_LATER
-#    define _CUPS_API_2_2
+#    define _CUPS_API_2_2 AVAILABLE_MAC_OS_X_VERSION_10_12_AND_LATER
 #  else
 #    define _CUPS_API_1_1_19
 #    define _CUPS_API_1_1_20
diff --git a/doc/help/api-raster.html b/doc/help/api-raster.html
index a51a8c4518..32aea8eb4a 100644
--- a/doc/help/api-raster.html
+++ b/doc/help/api-raster.html
@@ -617,7 +617,7 @@ void cupsRasterClose (<br>
 <h4 class="discussion">Discussion</h4>
 <p class="discussion">The file descriptor associated with the raster stream must be closed
 separately as needed.</p>
-<h3 class="function"><span class="info">&nbsp;CUPS 2.2&nbsp;</span><a name="cupsRasterInitPWGHeader">cupsRasterInitPWGHeader</a></h3>
+<h3 class="function"><span class="info">&nbsp;CUPS 2.2/macOS 10.12&nbsp;</span><a name="cupsRasterInitPWGHeader">cupsRasterInitPWGHeader</a></h3>
 <p class="description">Initialize a page header for PWG Raster output.</p>
 <p class="code">
 int cupsRasterInitPWGHeader (<br>
diff --git a/filter/raster.c b/filter/raster.c
index e6beef0156..dee8eeca07 100644
--- a/filter/raster.c
+++ b/filter/raster.c
@@ -107,7 +107,7 @@ cupsRasterClose(cups_raster_t *r)	/* I - Stream to close */
  * The "sheet_back" argument specifies a "pwg-raster-document-sheet-back" value
  * to apply for the back side of a page.  Pass @code NULL@ for the front side.
  *
- * @since CUPS 2.2@
+ * @since CUPS 2.2/macOS 10.12@
  */
 
 int					/* O - 1 on success, 0 on failure */