sync with userland

diff --git a/sys/lib/libz/zconf.h b/sys/lib/libz/zconf.h
index 6e5605f..7bc5562 100644 (file)
--- a/sys/lib/libz/zconf.h
+++ b/sys/lib/libz/zconf.h
@@ -526,7 +526,7 @@ typedef uLong FAR uLongf;
 #if !defined(_WIN32) && defined(Z_LARGE64)
 #  define z_off64_t off64_t
 #else
-#  if defined(_WIN32) && !defined(__GNUC__) && !defined(Z_SOLO)
+#  if defined(_WIN32) && !defined(__GNUC__)
 #    define z_off64_t __int64
 #  else
 #    define z_off64_t z_off_t

diff --git a/sys/lib/libz/zlib.h b/sys/lib/libz/zlib.h
index 062cfe6..547185e 100644 (file)
--- a/sys/lib/libz/zlib.h
+++ b/sys/lib/libz/zlib.h
@@ -729,7 +729,7 @@ ZEXTERN int ZEXPORT deflateParams(z_streamp strm,
    Then no more input data should be provided before the deflateParams() call.
    If this is done, the old level and strategy will be applied to the data
    compressed before deflateParams(), and the new level and strategy will be
-   applied to the the data compressed after deflateParams().
+   applied to the data compressed after deflateParams().
 
      deflateParams returns Z_OK on success, Z_STREAM_ERROR if the source stream
    state was inconsistent or if a parameter was invalid, or Z_BUF_ERROR if