Merge pull request #3060 from martymac/FreeBSD-fixes

Free bsd fixes
stenzek · Dec 2, 2023 · d0d5b79 · d0d5b79
2 parents e5af7fe + 5486a7a
commit d0d5b79
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/src/common/byte_stream.cpp b/src/common/byte_stream.cpp
@@ -28,8 +28,10 @@
 #ifdef _MSC_VER
 #include <malloc.h>
 #else
+#if !defined(__FreeBSD__)
 #include <alloca.h>
 #endif
+#endif
 
 Log_SetChannel(ByteStream);
 

diff --git a/src/common/threading.cpp b/src/common/threading.cpp
@@ -64,7 +64,7 @@ static u64 getthreadtime(thread_port_t thread)
 }
 #endif
 
-#ifdef __linux__
+#if defined(__linux__) || defined(__FreeBSD__)
 // Helper function to get either either the current cpu usage
 // in called thread or in id thread
 static u64 get_thread_time(void* id = 0)
@@ -227,7 +227,7 @@ u64 Threading::ThreadHandle::GetCPUTime() const
   return user.u64time + kernel.u64time;
 #elif defined(__APPLE__)
   return getthreadtime(pthread_mach_thread_np((pthread_t)m_native_handle));
-#elif defined(__linux__)
+#elif defined(__linux__) || defined(__FreeBSD__)
   return get_thread_time(m_native_handle);
 #else
   return 0;

diff --git a/src/duckstation-nogui/nogui_host.cpp b/src/duckstation-nogui/nogui_host.cpp
@@ -185,7 +185,7 @@ void NoGUIHost::SetDataDirectory()
       EmuFolders::DataRoot = Path::Combine(StringUtil::WideStringToUTF8String(documents_directory), "DuckStation");
     CoTaskMemFree(documents_directory);
   }
-#elif defined(__linux__)
+#elif defined(__linux__) || defined(__FreeBSD__)
   // Use $XDG_CONFIG_HOME/duckstation if it exists.
   const char* xdg_config_home = getenv("XDG_CONFIG_HOME");
   if (xdg_config_home && Path::IsAbsolute(xdg_config_home))

diff --git a/src/duckstation-qt/qthost.cpp b/src/duckstation-qt/qthost.cpp
@@ -290,7 +290,7 @@ void QtHost::SetDataDirectory()
       EmuFolders::DataRoot = Path::Combine(StringUtil::WideStringToUTF8String(documents_directory), "DuckStation");
     CoTaskMemFree(documents_directory);
   }
-#elif defined(__linux__)
+#elif defined(__linux__) || defined(__FreeBSD__)
   // Use $XDG_CONFIG_HOME/duckstation if it exists.
   const char* xdg_config_home = getenv("XDG_CONFIG_HOME");
   if (xdg_config_home && Path::IsAbsolute(xdg_config_home))