diff options
| author | Igor Pavlov <87184205+ip7z@users.noreply.github.com> | 2026-02-12 00:00:00 +0000 |
|---|---|---|
| committer | Igor Pavlov <87184205+ip7z@users.noreply.github.com> | 2026-02-12 17:38:49 +0500 |
| commit | 839151eaaad24771892afaae6bac690e31e58384 (patch) | |
| tree | e292449d621f7a1d503b975984a2aca240dd2d8f /C/7zWindows.h | |
| parent | 5e96a8279489832924056b1fa82f29d5837c9469 (diff) | |
| download | 7zip-26.00.tar.gz 7zip-26.00.tar.bz2 7zip-26.00.zip | |
Diffstat (limited to 'C/7zWindows.h')
| -rw-r--r-- | C/7zWindows.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/C/7zWindows.h b/C/7zWindows.h index 42c6db8..381159e 100644 --- a/C/7zWindows.h +++ b/C/7zWindows.h | |||
| @@ -1,11 +1,17 @@ | |||
| 1 | /* 7zWindows.h -- StdAfx | 1 | /* 7zWindows.h -- Windows.h and related code |
| 2 | 2023-04-02 : Igor Pavlov : Public domain */ | 2 | Igor Pavlov : Public domain */ |
| 3 | 3 | ||
| 4 | #ifndef ZIP7_INC_7Z_WINDOWS_H | 4 | #ifndef ZIP7_INC_7Z_WINDOWS_H |
| 5 | #define ZIP7_INC_7Z_WINDOWS_H | 5 | #define ZIP7_INC_7Z_WINDOWS_H |
| 6 | 6 | ||
| 7 | #ifdef _WIN32 | 7 | #ifdef _WIN32 |
| 8 | 8 | ||
| 9 | #if defined(_MSC_VER) && _MSC_VER >= 1950 && !defined(__clang__) // VS2026 | ||
| 10 | // <Windows.h> and some another windows files need that option | ||
| 11 | // VS2026: wtypesbase.h: warning C4865: 'tagCLSCTX': the underlying type will change from 'int' to 'unsigned int' when '/Zc:enumTypes' is specified on the command line | ||
| 12 | #pragma warning(disable : 4865) | ||
| 13 | #endif | ||
| 14 | |||
| 9 | #if defined(__clang__) | 15 | #if defined(__clang__) |
| 10 | # pragma clang diagnostic push | 16 | # pragma clang diagnostic push |
| 11 | #endif | 17 | #endif |