diff options
| author | DLL125 <134442578+DLL125@users.noreply.github.com> | 2023-05-25 12:52:53 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-25 12:52:53 +0200 |
| commit | 1fc4168b81f565feab409b92ccb61c57a1c550eb (patch) | |
| tree | f5b54c9699aabb120f4cfa3240164fc17fd1d075 /src/Common/libzip/config.h | |
| parent | b872702309b20f2467d58652c3b00493ac4058bd (diff) | |
| download | VeraCrypt-1fc4168b81f565feab409b92ccb61c57a1c550eb.tar.gz VeraCrypt-1fc4168b81f565feab409b92ccb61c57a1c550eb.zip | |
Update Libzip to latest 1.9.2 (#1071)
* Libzip 1.9.2
Updated Libzip to latest version 1.9.2 and changed version number in the config.h from 1.7.3 to 1.9.2. Not sure if anything else needs to be tweaked :)
* Modified Libzip to work with Visual studio
* Update README.md
Update libzip copyright.
* Added the missing files.
I've added the missing files zipconf.h and config.h, I've missed those sorry for that!
Diffstat (limited to 'src/Common/libzip/config.h')
| -rw-r--r-- | src/Common/libzip/config.h | 70 |
1 files changed, 31 insertions, 39 deletions
diff --git a/src/Common/libzip/config.h b/src/Common/libzip/config.h index 1edd29ba..cb76150c 100644 --- a/src/Common/libzip/config.h +++ b/src/Common/libzip/config.h @@ -5,68 +5,72 @@ #endif /* BEGIN DEFINES */ /* #undef HAVE___PROGNAME */ -#define HAVE__CHMOD #define HAVE__CLOSE #define HAVE__DUP #define HAVE__FDOPEN #define HAVE__FILENO -#define HAVE__OPEN #define HAVE__SETMODE +#if defined(_MSC_VER) && _MSC_VER < 1900 +#define HAVE__SNPRINTF +#else /* #undef HAVE__SNPRINTF */ +#endif #define HAVE__STRDUP #define HAVE__STRICMP #define HAVE__STRTOI64 #define HAVE__STRTOUI64 -#define HAVE__UMASK +/* #undef HAVE__UMASK */ #define HAVE__UNLINK +/* #undef HAVE_ARC4RANDOM */ /* #undef HAVE_CLONEFILE */ /* #undef HAVE_COMMONCRYPTO */ -/* #undef HAVE_CRYPTO */ +#define HAVE_CRYPTO /* #undef HAVE_FICLONERANGE */ #define HAVE_FILENO +/* #undef HAVE_FCHMOD */ /* #undef HAVE_FSEEKO */ /* #undef HAVE_FTELLO */ /* #undef HAVE_GETPROGNAME */ /* #undef HAVE_GNUTLS */ /* #undef HAVE_LIBBZ2 */ -#define HAVE_OPEN -/* #undef HAVE_OPENSSL */ +/* #undef HAVE_LIBLZMA */ +/* #undef HAVE_LIBZSTD */ +/* #undef HAVE_LOCALTIME_R */ +/* #undef HAVE_MBEDTLS */ /* #undef HAVE_MKSTEMP */ +/* #undef HAVE_NULLABLE */ +/* #undef HAVE_OPENSSL */ #define HAVE_SETMODE +#if defined(_MSC_VER) && _MSC_VER < 1900 /* #undef HAVE_SNPRINTF */ -/* #undef HAVE_SSIZE_T_LIBZIP */ +#else +#define HAVE_SNPRINTF +#endif /* #undef HAVE_STRCASECMP */ #define HAVE_STRDUP #define HAVE_STRICMP +#if defined(_MSC_VER) && _MSC_VER < 1800 /* #undef HAVE_STRTOLL */ /* #undef HAVE_STRTOULL */ +#else +#define HAVE_STRTOLL +#define HAVE_STRTOULL +#endif /* #undef HAVE_STRUCT_TM_TM_ZONE */ +#if defined(_MSC_VER) && _MSC_VER < 1800 /* #undef HAVE_STDBOOL_H */ +#else +#define HAVE_STDBOOL_H +#endif /* #undef HAVE_STRINGS_H */ /* #undef HAVE_UNISTD_H */ -#define __INT8_LIBZIP 1 -#define INT8_T_LIBZIP 1 -#define UINT8_T_LIBZIP 1 -#define __INT16_LIBZIP 2 -#define INT16_T_LIBZIP 2 -#define UINT16_T_LIBZIP 2 -#define __INT32_LIBZIP 4 -#define INT32_T_LIBZIP 4 -#define UINT32_T_LIBZIP 4 -#define __INT64_LIBZIP 8 -#define INT64_T_LIBZIP 8 -#define UINT64_T_LIBZIP 8 -#define SHORT_LIBZIP 2 -#define INT_LIBZIP 4 -#define LONG_LIBZIP 4 -#define LONG_LONG_LIBZIP 8 +#define HAVE_WINDOWS_CRYPTO #define SIZEOF_OFF_T 4 #ifdef _WIN64 -#define SIZE_T_LIBZIP 8 +#define SIZEOF_SIZE_T 8 #else -#define SIZE_T_LIBZIP 4 +#define SIZEOF_SIZE_T 4 #endif -/* #undef SSIZE_T_LIBZIP */ /* #undef HAVE_DIRENT_H */ /* #undef HAVE_FTS_H */ /* #undef HAVE_NDIR_H */ @@ -76,18 +80,6 @@ #define HAVE_SHARED /* END DEFINES */ #define PACKAGE "libzip" -#define VERSION "1.7.3" - -#ifndef HAVE_SSIZE_T_LIBZIP -# if SIZE_T_LIBZIP == INT_LIBZIP -typedef int ssize_t; -# elif SIZE_T_LIBZIP == LONG_LIBZIP -typedef long ssize_t; -# elif SIZE_T_LIBZIP == LONG_LONG_LIBZIP -typedef long long ssize_t; -# else -#error no suitable type for ssize_t found -# endif -#endif +#define VERSION "1.9.2" #endif /* HAD_CONFIG_H */ |