diff options
Diffstat (limited to 'zip/ZipArchive/stdafx.h')
| -rw-r--r-- | zip/ZipArchive/stdafx.h | 54 |
1 files changed, 40 insertions, 14 deletions
diff --git a/zip/ZipArchive/stdafx.h b/zip/ZipArchive/stdafx.h index ddb2fd4..ae4c35d 100644 --- a/zip/ZipArchive/stdafx.h +++ b/zip/ZipArchive/stdafx.h @@ -1,6 +1,6 @@ ////////////////////////////////////////////////////////////////////////////////
-// This source file is part of the ZipArchive library source distribution and
-// is Copyrighted 2000 - 2007 by Artpol Software - Tadeusz Dracz
+// This source file is part of the ZipArchive Library Open Source distribution
+// and is Copyrighted 2000 - 2022 by Artpol Software - Tadeusz Dracz
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
@@ -9,7 +9,7 @@ //
// For the licensing details refer to the License.txt file.
//
-// Web Site: http://www.artpol-software.com
+// Web Site: https://www.artpol-software.com
////////////////////////////////////////////////////////////////////////////////
/**
@@ -22,17 +22,13 @@ #define ZIPARCHIVE_STDAFX_DOT_H
#include "_features.h"
-#include "_platform.h"
-#include <unistd.h>
#if _MSC_VER > 1000
#pragma once
#endif
// uncomment to disable compiling standard error messages into the library
-#define ZIP_ENABLE_ERROR_DESCRIPTION
-
-
+#define _ZIP_ENABLE_ERROR_DESCRIPTION
#if _MSC_VER < 1300 && !defined __BORLANDC__ && !defined (__GNUC__)
#define ZIPINLINE inline
@@ -40,7 +36,7 @@ #define ZIPINLINE
#endif
-#ifdef ZIP_ARCHIVE_STL
+#ifdef _ZIP_IMPL_STL
#include "std_stl.h"
#else
#include "std_mfc.h"
@@ -50,7 +46,7 @@ #if _MSC_VER >= 1300
#define ZIPTRACE(f) TRACE(f,__FILE__,__LINE__)
#else
- #define ZIPTRACE(f) TRACE(_T(f))
+ #define ZIPTRACE(f) TRACE(_T(f), _T(""), 0)
#endif
#else
#define ZIPTRACE(f)
@@ -68,11 +64,27 @@ #define ZIP_SIZE_TYPE DWORD
#define ZIP_ZLIB_TYPE int
-#if !defined(_INTPTR_T_DEFINED) && !defined(__GNUC__)
- #if defined (__BORLANDC__)
+#ifdef __GNUC__
+ #include <unistd.h>
+#endif
+
+#if !defined(_INTPTR_T_DEFINED) && !defined(__intptr_t_defined)
+ #if __BORLANDC__ > 0x551
#include <stdint.h>
- #elif _MSC_VER <= 1200 || !defined _MSC_VER
- typedef long intptr_t;
+ #elif (_MSC_VER <= 1200 || !defined _MSC_VER) && (!defined(__GNUC__) || __GNUC__ > 4 || __GNUC__ == 4 && __GNUC_MINOR__ >= 7)
+ typedef long int intptr_t;
+ #endif
+#endif
+
+#ifndef UNICODE
+ #ifdef _ZIP_UNICODE_NORMALIZE
+ #undef _ZIP_UNICODE_NORMALIZE
+ #endif
+ #ifdef _ZIP_UNICODE_CUSTOM
+ #undef _ZIP_UNICODE_CUSTOM
+ #endif
+ #if defined _ZIP_UNICODE && defined _ZIP_SYSTEM_WIN
+ #undef _ZIP_UNICODE
#endif
#endif
@@ -80,5 +92,19 @@ #define ZIP_FILE_INDEX_UNSPECIFIED ZIP_FILE_INDEX_NOT_FOUND
#define ZIP_VOLUME_NUMBER_UNSPECIFIED ZIP_VOLUME_TYPE(-1)
+#if defined __GNUC__ || defined __MINGW32__
+ #define SUFFIX_I64(v) v##LL
+#else
+ #define SUFFIX_I64(v) v##i64
+#endif
+
+#ifdef _ZIP_SYSTEM_WIN
+ #define ZIP_SYSTEM_ERROR_TYPE DWORD
+#else
+ #define ZIP_SYSTEM_ERROR_TYPE int
+#endif
+
+
+
#endif // !defined(ZIPARCHIVE_STDAFX_DOT_H)
|