From 5c51021388f2bcb57654d47d831770d3166dc369 Mon Sep 17 00:00:00 2001
From: Ari Vuollet <ari.vuollet@goat.moe>
Date: Mon, 7 Apr 2025 23:19:49 +0300
Subject: [PATCH] Fix merge

---
 Source/Engine/Platform/Linux/LinuxPlatform.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Source/Engine/Platform/Linux/LinuxPlatform.cpp b/Source/Engine/Platform/Linux/LinuxPlatform.cpp
index dfc4835f7..f5fced5d3 100644
--- a/Source/Engine/Platform/Linux/LinuxPlatform.cpp
+++ b/Source/Engine/Platform/Linux/LinuxPlatform.cpp
@@ -1345,6 +1345,7 @@ namespace Impl
         X11::XQueryPointer(display, w, &wtmp, &child, &tmp, &tmp, &tmp, &tmp, &utmp);
         return FindAppWindow(display, child);
     }
+#endif
 
     Dictionary<String, String> LoadConfigFile(StringView path)
 	{
@@ -1372,7 +1373,6 @@ namespace Impl
 		}
 		return results;
 	}
-#endif
 }
 
 #if !PLATFORM_SDL
@@ -2704,7 +2704,6 @@ void LinuxPlatform::Exit()
 #endif
 }
 
-#if !PLATFORM_SDL
 String LinuxPlatform::GetSystemName()
 {
     Dictionary<String, String> configs = Impl::LoadConfigFile(TEXT("/etc/os-release"));
@@ -2724,6 +2723,7 @@ Version LinuxPlatform::GetSystemVersion()
     return Version(0, 0);
 }
 
+#if !PLATFORM_SDL
 int32 LinuxPlatform::GetDpi()
 {
     return SystemDpi;