From: Michael R Sweet <msweet@msweet.org>
Date: Thu, 26 Aug 2021 22:53:12 +0000 (-0400)
Subject: Use __int64 for ssize_t on Windows.
X-Git-Tag: v2.4b1~88
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=986a5fc41f5fd7202f1bc6ec1e661c9e88ff803f;p=thirdparty%2Fcups.git

Use __int64 for ssize_t on Windows.

Bump NuGet version.
---

diff --git a/cups/cups.h b/cups/cups.h
index efef740509..760a1a01c0 100644
--- a/cups/cups.h
+++ b/cups/cups.h
@@ -19,8 +19,8 @@
 #  if defined(_WIN32) && !defined(__CUPS_SSIZE_T_DEFINED)
 #    define __CUPS_SSIZE_T_DEFINED
 #    include <stddef.h>
-/* Windows does not support the ssize_t type, so map it to long... */
-typedef long ssize_t;			/* @private@ */
+/* Windows does not support the ssize_t type, so map it to __int64... */
+typedef __int64 ssize_t;			/* @private@ */
 #  endif /* _WIN32 && !__CUPS_SSIZE_T_DEFINED */
 
 #  include "file.h"
diff --git a/cups/http.h b/cups/http.h
index 01a0321dfa..8d3ad22f50 100644
--- a/cups/http.h
+++ b/cups/http.h
@@ -23,8 +23,8 @@
 #  ifdef _WIN32
 #    ifndef __CUPS_SSIZE_T_DEFINED
 #      define __CUPS_SSIZE_T_DEFINED
-/* Windows does not support the ssize_t type, so map it to off_t... */
-typedef off_t ssize_t;			/* @private@ */
+/* Windows does not support the ssize_t type, so map it to __int64... */
+typedef __int64 ssize_t;			/* @private@ */
 #    endif /* !__CUPS_SSIZE_T_DEFINED */
 #    include <winsock2.h>
 #    include <ws2tcpip.h>
diff --git a/cups/sidechannel.h b/cups/sidechannel.h
index 538b8b2362..feafab8835 100644
--- a/cups/sidechannel.h
+++ b/cups/sidechannel.h
@@ -19,8 +19,8 @@
 #  if defined(_WIN32) && !defined(__CUPS_SSIZE_T_DEFINED)
 #    define __CUPS_SSIZE_T_DEFINED
 #    include <stddef.h>
-/* Windows does not support the ssize_t type, so map it to long... */
-typedef long ssize_t;			/* @private@ */
+/* Windows does not support the ssize_t type, so map it to __int64... */
+typedef __int64 ssize_t;			/* @private@ */
 #  endif /* _WIN32 && !__CUPS_SSIZE_T_DEFINED */
 
 
diff --git a/cups/string-private.h b/cups/string-private.h
index 29de96e5c2..335e579c86 100644
--- a/cups/string-private.h
+++ b/cups/string-private.h
@@ -31,8 +31,8 @@
 #  if defined(_WIN32) && !defined(__CUPS_SSIZE_T_DEFINED)
 #    define __CUPS_SSIZE_T_DEFINED
 #    include <stddef.h>
-/* Windows does not support the ssize_t type, so map it to long... */
-typedef long ssize_t;			/* @private@ */
+/* Windows does not support the ssize_t type, so map it to __int64... */
+typedef __int64 ssize_t;			/* @private@ */
 #  endif /* _WIN32 && !__CUPS_SSIZE_T_DEFINED */
 
 
diff --git a/vcnet/libcups2_native.nuspec b/vcnet/libcups2_native.nuspec
index f9238287a3..87abc733db 100644
--- a/vcnet/libcups2_native.nuspec
+++ b/vcnet/libcups2_native.nuspec
@@ -3,7 +3,7 @@
     <metadata>
         <id>libcups2_native</id>
         <title>OpenPrinting CUPS Library for VS2019+</title>
-        <version>2.4.0-b4</version>
+        <version>2.4.0-b5</version>
         <authors>Michael R Sweet, OpenPrinting</authors>
         <owners>michaelrsweet</owners>
         <projectUrl>https://github.com/OpenPrinting/cups</projectUrl>
@@ -16,7 +16,7 @@ and other Unix®-like operating systems. The CUPS library provides a convenient
         <copyright>Copyright © 2020-2021 by OpenPrinting, Copyright © 2007-2019 by Apple Inc., Copyright © 1997-2007 by Easy Software Products.</copyright>
         <tags>http ipp native</tags>
 	<dependencies>
-	    <dependency id="libcups2_native.redist" version="2.4.0-b4" />
+	    <dependency id="libcups2_native.redist" version="2.4.0-b5" />
 	</dependencies>
     </metadata>
     <files>
diff --git a/vcnet/libcups2_native.redist.nuspec b/vcnet/libcups2_native.redist.nuspec
index f6f0ebadb4..7657527160 100644
--- a/vcnet/libcups2_native.redist.nuspec
+++ b/vcnet/libcups2_native.redist.nuspec
@@ -3,7 +3,7 @@
     <metadata>
         <id>libcups2_native.redist</id>
         <title>OpenPrinting CUPS Library for VS2019+ Redist</title>
-        <version>2.4.0-b4</version>
+        <version>2.4.0-b5</version>
         <authors>Michael R Sweet, OpenPrinting</authors>
         <owners>michaelrsweet</owners>
         <projectUrl>https://github.com/OpenPrinting/cups</projectUrl>