From 02fb9915bf106f3f17fe3857f6788d74004cd30b Mon Sep 17 00:00:00 2001 From: sithlord48 Date: Wed, 6 Aug 2025 20:38:51 -0400 Subject: [PATCH] refactor: Arch, only define init override on windows, where its ambiguious --- src/lib/arch/Arch.cpp | 5 +++-- src/lib/arch/Arch.h | 3 +++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/lib/arch/Arch.cpp b/src/lib/arch/Arch.cpp index a3c0745afc..a8ffb79178 100644 --- a/src/lib/arch/Arch.cpp +++ b/src/lib/arch/Arch.cpp @@ -1,5 +1,6 @@ /* * Deskflow -- mouse and keyboard sharing utility + * SPDX-FileCopyrightText: (C) 2025 Deskflow Developers * SPDX-FileCopyrightText: (C) 2012 - 2016 Symless Ltd. * SPDX-FileCopyrightText: (C) 2002 Chris Schoeneman * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception @@ -30,13 +31,13 @@ Arch::Arch(Arch *arch) s_instance = arch; } +#if SYSAPI_WIN32 void Arch::init() { ARCH_NETWORK::init(); -#if SYSAPI_WIN32 ArchMiscWindows::init(); -#endif } +#endif Arch *Arch::getInstance() { diff --git a/src/lib/arch/Arch.h b/src/lib/arch/Arch.h index f4d72c29de..e888d98e45 100644 --- a/src/lib/arch/Arch.h +++ b/src/lib/arch/Arch.h @@ -1,5 +1,6 @@ /* * Deskflow -- mouse and keyboard sharing utility + * SPDX-FileCopyrightText: (C) 2025 Deskflow Developers * SPDX-FileCopyrightText: (C) 2012 - 2016 Symless Ltd. * SPDX-FileCopyrightText: (C) 2002 Chris Schoeneman * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception @@ -66,12 +67,14 @@ public: explicit Arch(Arch *arch); ~Arch() override = default; +#if SYSAPI_WIN32 //! Call init on other arch classes. /*! Some arch classes depend on others to exist first. When init is called these classes will have ARCH available for use. */ void init() override; +#endif // // accessors