1
0
mirror of https://github.com/veracrypt/VeraCrypt.git synced 2025-11-11 11:08:02 -06:00

Renormalize 7zWindows.h from CRLF to LF line separator as intended (#1144)

This commit is contained in:
Jertzukka
2023-07-02 22:51:44 +03:00
committed by GitHub
parent efa815a6da
commit 3b80c8416b

View File

@@ -1,101 +1,101 @@
/* 7zWindows.h -- StdAfx /* 7zWindows.h -- StdAfx
2023-04-02 : Igor Pavlov : Public domain */ 2023-04-02 : Igor Pavlov : Public domain */
#ifndef ZIP7_INC_7Z_WINDOWS_H #ifndef ZIP7_INC_7Z_WINDOWS_H
#define ZIP7_INC_7Z_WINDOWS_H #define ZIP7_INC_7Z_WINDOWS_H
#ifdef _WIN32 #ifdef _WIN32
#if defined(__clang__) #if defined(__clang__)
# pragma clang diagnostic push # pragma clang diagnostic push
#endif #endif
#if defined(_MSC_VER) #if defined(_MSC_VER)
#pragma warning(push) #pragma warning(push)
#pragma warning(disable : 4668) // '_WIN32_WINNT' is not defined as a preprocessor macro, replacing with '0' for '#if/#elif' #pragma warning(disable : 4668) // '_WIN32_WINNT' is not defined as a preprocessor macro, replacing with '0' for '#if/#elif'
#if _MSC_VER == 1900 #if _MSC_VER == 1900
// for old kit10 versions // for old kit10 versions
// #pragma warning(disable : 4255) // winuser.h(13979): warning C4255: 'GetThreadDpiAwarenessContext': // #pragma warning(disable : 4255) // winuser.h(13979): warning C4255: 'GetThreadDpiAwarenessContext':
#endif #endif
// win10 Windows Kit: // win10 Windows Kit:
#endif // _MSC_VER #endif // _MSC_VER
#if defined(_MSC_VER) && _MSC_VER <= 1200 && !defined(_WIN64) #if defined(_MSC_VER) && _MSC_VER <= 1200 && !defined(_WIN64)
// for msvc6 without sdk2003 // for msvc6 without sdk2003
#define RPC_NO_WINDOWS_H #define RPC_NO_WINDOWS_H
#endif #endif
#if defined(__MINGW32__) || defined(__MINGW64__) #if defined(__MINGW32__) || defined(__MINGW64__)
// #if defined(__GNUC__) && !defined(__clang__) // #if defined(__GNUC__) && !defined(__clang__)
#include <windows.h> #include <windows.h>
#else #else
#include <Windows.h> #include <Windows.h>
#endif #endif
// #include <basetsd.h> // #include <basetsd.h>
// #include <wtypes.h> // #include <wtypes.h>
// but if precompiled with clang-cl then we need // but if precompiled with clang-cl then we need
// #include <windows.h> // #include <windows.h>
#if defined(_MSC_VER) #if defined(_MSC_VER)
#pragma warning(pop) #pragma warning(pop)
#endif #endif
#if defined(__clang__) #if defined(__clang__)
# pragma clang diagnostic pop # pragma clang diagnostic pop
#endif #endif
#if defined(_MSC_VER) && _MSC_VER <= 1200 && !defined(_WIN64) #if defined(_MSC_VER) && _MSC_VER <= 1200 && !defined(_WIN64)
#ifndef _W64 #ifndef _W64
typedef long LONG_PTR, *PLONG_PTR; typedef long LONG_PTR, *PLONG_PTR;
typedef unsigned long ULONG_PTR, *PULONG_PTR; typedef unsigned long ULONG_PTR, *PULONG_PTR;
typedef ULONG_PTR DWORD_PTR, *PDWORD_PTR; typedef ULONG_PTR DWORD_PTR, *PDWORD_PTR;
#define Z7_OLD_WIN_SDK #define Z7_OLD_WIN_SDK
#endif // _W64 #endif // _W64
#endif // _MSC_VER == 1200 #endif // _MSC_VER == 1200
#ifdef Z7_OLD_WIN_SDK #ifdef Z7_OLD_WIN_SDK
#ifndef INVALID_FILE_ATTRIBUTES #ifndef INVALID_FILE_ATTRIBUTES
#define INVALID_FILE_ATTRIBUTES ((DWORD)-1) #define INVALID_FILE_ATTRIBUTES ((DWORD)-1)
#endif #endif
#ifndef INVALID_SET_FILE_POINTER #ifndef INVALID_SET_FILE_POINTER
#define INVALID_SET_FILE_POINTER ((DWORD)-1) #define INVALID_SET_FILE_POINTER ((DWORD)-1)
#endif #endif
#ifndef FILE_SPECIAL_ACCESS #ifndef FILE_SPECIAL_ACCESS
#define FILE_SPECIAL_ACCESS (FILE_ANY_ACCESS) #define FILE_SPECIAL_ACCESS (FILE_ANY_ACCESS)
#endif #endif
// ShlObj.h: // ShlObj.h:
// #define BIF_NEWDIALOGSTYLE 0x0040 // #define BIF_NEWDIALOGSTYLE 0x0040
#pragma warning(disable : 4201) #pragma warning(disable : 4201)
// #pragma warning(disable : 4115) // #pragma warning(disable : 4115)
#undef VARIANT_TRUE #undef VARIANT_TRUE
#define VARIANT_TRUE ((VARIANT_BOOL)-1) #define VARIANT_TRUE ((VARIANT_BOOL)-1)
#endif #endif
#endif // Z7_OLD_WIN_SDK #endif // Z7_OLD_WIN_SDK
#ifdef UNDER_CE #ifdef UNDER_CE
#undef VARIANT_TRUE #undef VARIANT_TRUE
#define VARIANT_TRUE ((VARIANT_BOOL)-1) #define VARIANT_TRUE ((VARIANT_BOOL)-1)
#endif #endif
#if defined(_MSC_VER) #if defined(_MSC_VER)
#if _MSC_VER >= 1400 && _MSC_VER <= 1600 #if _MSC_VER >= 1400 && _MSC_VER <= 1600
// BaseTsd.h(148) : 'HandleToULong' : unreferenced inline function has been removed // BaseTsd.h(148) : 'HandleToULong' : unreferenced inline function has been removed
// string.h // string.h
// #pragma warning(disable : 4514) // #pragma warning(disable : 4514)
#endif #endif
#endif #endif
/* #include "7zTypes.h" */ /* #include "7zTypes.h" */
#endif #endif