From 1fc4168b81f565feab409b92ccb61c57a1c550eb Mon Sep 17 00:00:00 2001 From: DLL125 <134442578+DLL125@users.noreply.github.com> Date: Thu, 25 May 2023 12:52:53 +0200 Subject: 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! --- src/Common/libzip/compat.h | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) (limited to 'src/Common/libzip/compat.h') diff --git a/src/Common/libzip/compat.h b/src/Common/libzip/compat.h index fb2c56e1..82661792 100644 --- a/src/Common/libzip/compat.h +++ b/src/Common/libzip/compat.h @@ -3,10 +3,10 @@ /* compat.h -- compatibility defines. - Copyright (C) 1999-2019 Dieter Baron and Thomas Klausner + Copyright (C) 1999-2021 Dieter Baron and Thomas Klausner This file is part of libzip, a library to manipulate ZIP archives. - The authors can be contacted at + The authors can be contacted at Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions @@ -41,27 +41,26 @@ /* to have *_MAX definitions for all types when compiling with g++ */ #define __STDC_LIMIT_MACROS -#ifdef _WIN32 -#ifndef ZIP_EXTERN -#ifndef ZIP_STATIC +#if defined(_WIN32) && defined(ZIP_DLL) && !defined(ZIP_STATIC) +#ifdef BUILDING_LIBZIP #define ZIP_EXTERN __declspec(dllexport) #else -#define ZIP_EXTERN +#define ZIP_EXTERN __declspec(dllimport) #endif #endif + +#ifdef _WIN32 /* for dup(), close(), etc. */ #include #endif #ifdef HAVE_STDBOOL_H #include -#else -#ifndef __cplusplus +#elif !defined(__BOOL_DEFINED) typedef char bool; #define true 1 #define false 0 #endif -#endif #include @@ -85,9 +84,6 @@ typedef char bool; #endif #ifdef _WIN32 -#if defined(HAVE__CHMOD) -#define chmod _chmod -#endif #if defined(HAVE__CLOSE) #define close _close #endif @@ -101,7 +97,7 @@ typedef char bool; #if !defined(HAVE_FILENO) && defined(HAVE__FILENO) #define fileno _fileno #endif -#if defined(HAVE__SNPRINTF) +#if !defined(HAVE_SNPRINTF) && defined(HAVE__SNPRINTF) #define snprintf _snprintf #endif #if defined(HAVE__STRDUP) -- cgit v1.2.3