Use __int64 for ssize_t on Windows.

Bump NuGet version.

diff --git a/cups/cups.h b/cups/cups.h
index efef74050931450b8bbc9780ee576be576c7fb25..760a1a01c002c871a8ccc057064779ec15095092 100644 (file)
--- 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 01a0321dfa068a3396f479f1039e8bc83b949f74..8d3ad22f5093d32202c6577f33f3f9f11db28305 100644 (file)
--- 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 538b8b23629ab179d8a69649e37ab19b95f1bf8f..feafab883595dea930a0e7e897722adce1b7b611 100644 (file)
--- 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 29de96e5c2c2f9ec520166f17e741757cbf6d608..335e579c86ce4e209e0fc0002ed0aa55d89a92b8 100644 (file)
--- 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 f9238287a3d7d508ab16f43f17590c981e298ad8..87abc733db877d13207e1829d0ce9eea1c04cbcd 100644 (file)
--- 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 f6f0ebadb4204e0ae4381a9d9bf4597f0f334fdf..7657527160d929095d5b3d0921bb0823f16e1954 100644 (file)
--- 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>