Fix "small" undef in Windows includes.

This commit is contained in:
John Preston 2023-11-13 22:27:31 +04:00
parent 8a19fab19c
commit 5cabfb56e0
13 changed files with 16 additions and 14 deletions

View file

@ -7,13 +7,12 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
*/
#pragma once
#include "base/platform/win/base_windows_shlobj_h.h"
#include "base/platform/win/base_windows_winrt.h"
#include "platform/platform_integration.h"
#include <QAbstractNativeEventFilter>
#include <ShlObj.h>
namespace Platform {
class WindowsIntegration final

View file

@ -9,8 +9,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "core/crash_reports.h"
#include "core/update_checker.h"
#include "base/platform/win/base_windows_h.h"
#include <windows.h>
#include <shellapi.h>
#include <VersionHelpers.h>

View file

@ -8,9 +8,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#pragma once
#include "platform/platform_main_window.h"
#include "base/platform/win/base_windows_h.h"
#include "base/flags.h"
#include <windows.h>
namespace Ui {
class PopupMenu;
} // namespace Ui

View file

@ -10,6 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "window/notifications_utilities.h"
#include "window/window_session_controller.h"
#include "base/platform/win/base_windows_co_task_mem.h"
#include "base/platform/win/base_windows_rpcndr_h.h"
#include "base/platform/win/base_windows_winrt.h"
#include "base/platform/base_platform_info.h"
#include "base/platform/win/wrl/wrl_module_h.h"

View file

@ -14,6 +14,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "platform/win/windows_autostart_task.h"
#include "base/platform/base_platform_info.h"
#include "base/platform/win/base_windows_co_task_mem.h"
#include "base/platform/win/base_windows_shlobj_h.h"
#include "base/platform/win/base_windows_winrt.h"
#include "base/call_delayed.h"
#include "ui/boxes/confirm_box.h"
@ -41,7 +42,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include <openssl/err.h>
#include <dbghelp.h>
#include <shlobj.h>
#include <Shlwapi.h>
#include <Strsafe.h>
#include <Windowsx.h>

View file

@ -8,7 +8,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#pragma once
#include "platform/platform_specific.h"
#include "base/platform/win/base_windows_h.h"
#include <windows.h>
namespace Data {
class LocationPoint;

View file

@ -7,8 +7,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
*/
#pragma once
#include "base/platform/win/base_windows_h.h"
#include <wtypes.h>
namespace Platform {

View file

@ -7,10 +7,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
*/
#pragma once
#include "base/platform/win/base_windows_h.h"
#include "base/platform/win/base_windows_shlobj_h.h"
#include <windows.h>
#include <shellapi.h>
#include <shlobj.h>
#include <dwmapi.h>
#include <RestartManager.h>
#include <psapi.h>

View file

@ -7,7 +7,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
*/
#pragma once
#include "base/platform/win/base_windows_rpcndr_h.h"
#include "windows_toastactivator_h.h"
#include "base/platform/win/wrl/wrl_implements_h.h"
// {F11932D3-6110-4BBC-9B02-B2EC07A1BD19}

@ -1 +1 @@
Subproject commit fe4f0a72d2041a860c67a81a70f2e4b6f845d9fb
Subproject commit 5432626ef2af59f55110c3bf17556d16c48a4ac3

@ -1 +1 @@
Subproject commit 1dfd1c186dd67e8de5f0721e6fae487a05f3ea94
Subproject commit de731885163bc1b3fe3095413453777ee89a8561

@ -1 +1 @@
Subproject commit f9b24c75512bc5f73b9ec5e6612858394582a328
Subproject commit fee301f94197d3351f2f20671c329b81540e63e2

@ -1 +1 @@
Subproject commit aab27269ff8aad5dfaf7372db10bff700fdb5fe9
Subproject commit 3495eb8dd8f4e2dab9493b4a698e5006fadbca47