]> git.lizzy.rs Git - zlib.git/commitdiff
Use intptr_t for z_ssize_t on MSVC.
authorMark Adler <madler@alumni.caltech.edu>
Sat, 31 Dec 2016 07:40:43 +0000 (23:40 -0800)
committerMark Adler <madler@alumni.caltech.edu>
Sat, 31 Dec 2016 07:42:22 +0000 (23:42 -0800)
zconf.h
zconf.h.cmakein
zconf.h.in

diff --git a/zconf.h b/zconf.h
index aee94b0c8757874b64fcab7414e075a91f6e495a..f6481d1552b53e9f9a628f64b2f84284c0d13e46 100644 (file)
--- a/zconf.h
+++ b/zconf.h
 #  ifdef NO_SSIZE_T
      typedef NO_SSIZE_T z_ssize_t;
 #  else
+#    include <stddef.h>
 #    include <sys/types.h>
-     typedef ssize_t z_ssize_t;
+#    ifdef _MSC_VER
+       typedef intptr_t z_ssize_t;
+#    else
+       typedef ssize_t z_ssize_t;
+#    endif
 #  endif
 #  undef z_longlong
 #endif
index fe970710e2cdc9b2fc70cd5d442c24c036fc9a62..843aeb47cabe24bead30f06ef2a46cd1b869fb99 100644 (file)
 #  ifdef NO_SSIZE_T
      typedef NO_SSIZE_T z_ssize_t;
 #  else
+#    include <stddef.h>
 #    include <sys/types.h>
-     typedef ssize_t z_ssize_t;
+#    ifdef _MSC_VER
+       typedef intptr_t z_ssize_t;
+#    else
+       typedef ssize_t z_ssize_t;
+#    endif
 #  endif
 #  undef z_longlong
 #endif
index aee94b0c8757874b64fcab7414e075a91f6e495a..f6481d1552b53e9f9a628f64b2f84284c0d13e46 100644 (file)
 #  ifdef NO_SSIZE_T
      typedef NO_SSIZE_T z_ssize_t;
 #  else
+#    include <stddef.h>
 #    include <sys/types.h>
-     typedef ssize_t z_ssize_t;
+#    ifdef _MSC_VER
+       typedef intptr_t z_ssize_t;
+#    else
+       typedef ssize_t z_ssize_t;
+#    endif
 #  endif
 #  undef z_longlong
 #endif