Move cupsHashString to 2.2.7 and add a 2.2.7 API versioning tag.

diff --git a/cups/cups.h b/cups/cups.h
index 1a0b34a3d10c220af46e7e3a677d425cdf011b6a..59c8306b14978c26518759ef18d27ca23ca60936 100644 (file)
--- a/cups/cups.h
+++ b/cups/cups.h
@@ -600,10 +600,12 @@ extern ssize_t            cupsHashData(const char *algorithm, const void *data, size_t dat
 extern int             cupsAddIntegerOption(const char *name, int value, int num_options, cups_option_t **options) _CUPS_API_2_2_4;
 extern int             cupsGetIntegerOption(const char *name, int num_options, cups_option_t *options) _CUPS_API_2_2_4;
 
+/* New in CUPS 2.2.7 */
+extern const char      *cupsHashString(const unsigned char *hash, size_t hashsize, char *buffer, size_t bufsize) _CUPS_API_2_2_7;
+
 /* New in CUPS 2.3 */
 extern int             cupsAddDestMediaOptions(http_t *http, cups_dest_t *dest, cups_dinfo_t *dinfo, unsigned flags, cups_size_t *size, int num_options, cups_option_t **options) _CUPS_API_2_3;
 extern ipp_attribute_t *cupsEncodeOption(ipp_t *ipp, ipp_tag_t group_tag, const char *name, const char *value) _CUPS_API_2_3;
-extern const char      *cupsHashString(const unsigned char *hash, size_t hashsize, char *buffer, size_t bufsize) _CUPS_API_2_3;
 
 #  ifdef __cplusplus
 }

diff --git a/cups/versioning.h b/cups/versioning.h
index b590cc75eff9be2ac0df25c8a1d7111e1279af59..1b86813b61090895d7f7174645b5f96dc5b1589b 100644 (file)
--- a/cups/versioning.h
+++ b/cups/versioning.h
@@ -1,9 +1,10 @@
 /*
  * API versioning definitions for CUPS.
  *
- * Copyright 2007-2017 by Apple Inc.
+ * Copyright © 2007-2018 by Apple Inc.
  *
- * Licensed under Apache License v2.0.  See the file "LICENSE" for more information.
+ * Licensed under Apache License v2.0.  See the file "LICENSE" for more
+ * information.
  */
 
 #ifndef _CUPS_VERSIONING_H_
@@ -65,6 +66,7 @@
 #    define _CUPS_API_2_0 AVAILABLE_MAC_OS_X_VERSION_10_10_AND_LATER
 #    define _CUPS_API_2_2 AVAILABLE_MAC_OS_X_VERSION_10_12_AND_LATER
 #    define _CUPS_API_2_2_4 AVAILABLE_MAC_OS_X_VERSION_10_13_AND_LATER
+#    define _CUPS_API_2_2_7
 #    define _CUPS_API_2_3
 #  else
 #    define _CUPS_API_1_1_19
@@ -79,6 +81,7 @@
 #    define _CUPS_API_2_0
 #    define _CUPS_API_2_2
 #    define _CUPS_API_2_2_4
+#    define _CUPS_API_2_2_7
 #    define _CUPS_API_2_3
 #  endif /* __APPLE__ && !_CUPS_SOURCE */