From: Michael R Sweet <michael.r.sweet@gmail.com>
Date: Mon, 21 Jan 2019 16:54:58 +0000 (-0500)
Subject: Fix compile error on Linux (Issue #5483)
X-Git-Tag: v2.2.11~25
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=328d863971d7a4272a6b073ed90df12dfd3fd01f;p=thirdparty%2Fcups.git

Fix compile error on Linux (Issue #5483)
---

diff --git a/CHANGES.md b/CHANGES.md
index adb815485b..a49bc3d7de 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -9,6 +9,7 @@ Changes in CUPS v2.2.11
   advertised (Issue #5455)
 - Fixed a potential memory leak when reading at the end of a file (Issue #5473)
 - Added a USB quirks rule for the Lexmark E120n (Issue #5478)
+- Fixed a compile error on Linux (Issue #5483)
 - The lpadmin command, web interface, and scheduler all queried an IPP
   Everywhere printer differently, resulting in different PPDs for the same
   printer (Issue #5484)
diff --git a/cups/hash.c b/cups/hash.c
index 50dc5fb301..a313725958 100644
--- a/cups/hash.c
+++ b/cups/hash.c
@@ -1,7 +1,7 @@
 /*
  * Hashing function for CUPS.
  *
- * Copyright © 2015-2018 by Apple Inc.
+ * Copyright © 2015-2019 by Apple Inc.
  *
  * These coded instructions, statements, and computer programs are the
  * property of Apple Inc. and are protected by Federal copyright
@@ -235,7 +235,7 @@ cupsHashData(const char    *algorithm,	/* I - Algorithm name */
 
     gnutls_hash_fast(alg, data, datalen, hash);
 
-    return (gnutls_hash_get_len(alg));
+    return ((ssize_t)gnutls_hash_get_len(alg));
   }
 
 #else