Linux build fix

amnezia-vpn · Sep 6, 2023 · 596a018 · 596a018
1 parent ecedcb4
commit 596a018
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/client/mozilla/networkwatcher.cpp b/client/mozilla/networkwatcher.cpp
@@ -19,7 +19,7 @@
 #endif
 
 #ifdef MZ_LINUX
-#  include "platforms/linux/linuxnetworkwatcher.h"
+//#  include "platforms/linux/linuxnetworkwatcher.h"
 #endif
 
 #ifdef MZ_MACOS
@@ -56,7 +56,7 @@ void NetworkWatcher::initialize() {
 #if defined(MZ_WINDOWS)
   m_impl = new WindowsNetworkWatcher(this);
 #elif defined(MZ_LINUX)
-  m_impl = new LinuxNetworkWatcher(this);
+//  m_impl = new LinuxNetworkWatcher(this);
 #elif defined(MZ_MACOS)
   m_impl = new MacOSNetworkWatcher(this);
 #elif defined(MZ_WASM)

diff --git a/client/mozilla/pingsenderfactory.cpp b/client/mozilla/pingsenderfactory.cpp
@@ -5,7 +5,7 @@
 #include "pingsenderfactory.h"
 
 #if defined(MZ_LINUX) || defined(MZ_ANDROID)
-#  include "platforms/linux/linuxpingsender.h"
+//#  include "platforms/linux/linuxpingsender.h"
 #elif defined(MZ_MACOS) || defined(MZ_IOS)
 #  include "platforms/macos/macospingsender.h"
 #elif defined(MZ_WINDOWS)
@@ -19,7 +19,8 @@
 PingSender* PingSenderFactory::create(const QHostAddress& source,
                                       QObject* parent) {
 #if defined(MZ_LINUX) || defined(MZ_ANDROID)
-  return new LinuxPingSender(source, parent);
+    return nullptr;
+    //  return new LinuxPingSender(source, parent);
 #elif defined(MZ_MACOS) || defined(MZ_IOS)
   return new MacOSPingSender(source, parent);
 #elif defined(MZ_WINDOWS)

diff --git a/service/server/localserver.h b/service/server/localserver.h
@@ -10,13 +10,13 @@
 
 #include "ipcserver.h"
 
-#include "../../client/daemon/daemonlocalserver.h"
-
 #ifdef Q_OS_WIN
+#include "../../client/daemon/daemonlocalserver.h"
 #include "windows/daemon/windowsdaemon.h"
 #endif
 
 #ifdef Q_OS_MAC
+#include "../../client/daemon/daemonlocalserver.h"
 #include "macos/daemon/macosdaemon.h"
 #endif
 
@@ -38,13 +38,12 @@ class LocalServer : public QObject
     QRemoteObjectHost m_serverNode;
     bool m_isRemotingEnabled = false;
 
-
-    DaemonLocalServer server{qApp};
-
 #ifdef Q_OS_WIN
+    DaemonLocalServer server{qApp};
     WindowsDaemon daemon;
 #endif
 #ifdef Q_OS_MAC
+    DaemonLocalServer server{qApp};
     MacOSDaemon daemon;
 #endif
 };