aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRechi <Rechi@users.noreply.github.com>2018-02-27 20:00:00 +0100
committerRechi <Rechi@users.noreply.github.com>2018-02-27 20:00:00 +0100
commite658aa1816444dfc38cff5060f5726784a8bb66b (patch)
tree0737ecd40dba96e7a3bac8d075381d0b1a51e3cb
parentb0b746c916654faf2ba5c72a643fb631e6c3bca9 (diff)
[cleanup] drop support for FreeBSD lower than 9.0-STABLE
-rw-r--r--xbmc/threads/platform/pthreads/ThreadImpl.cpp10
-rw-r--r--xbmc/utils/SystemInfo.cpp3
2 files changed, 1 insertions, 12 deletions
diff --git a/xbmc/threads/platform/pthreads/ThreadImpl.cpp b/xbmc/threads/platform/pthreads/ThreadImpl.cpp
index e8e454bc3c..ecb51899c6 100644
--- a/xbmc/threads/platform/pthreads/ThreadImpl.cpp
+++ b/xbmc/threads/platform/pthreads/ThreadImpl.cpp
@@ -28,12 +28,8 @@
#include <string.h>
#ifdef TARGET_FREEBSD
#include <sys/param.h>
-#if __FreeBSD_version < 900031
-#include <sys/thr.h>
-#else
#include <pthread_np.h>
#endif
-#endif
#include <signal.h>
#include "utils/log.h"
@@ -89,13 +85,7 @@ void CThread::TermHandler() { }
void CThread::SetThreadInfo()
{
#ifdef TARGET_FREEBSD
-#if __FreeBSD_version < 900031
- long lwpid;
- thr_self(&lwpid);
- m_ThreadOpaque.LwpId = lwpid;
-#else
m_ThreadOpaque.LwpId = pthread_getthreadid_np();
-#endif
#elif defined(TARGET_ANDROID)
m_ThreadOpaque.LwpId = gettid();
#else
diff --git a/xbmc/utils/SystemInfo.cpp b/xbmc/utils/SystemInfo.cpp
index c4ff3198c0..30b22f7aa4 100644
--- a/xbmc/utils/SystemInfo.cpp
+++ b/xbmc/utils/SystemInfo.cpp
@@ -1308,8 +1308,7 @@ std::string CSysInfo::GetBuildTargetPlatformVersionDecoded(void)
static const int major = (__FreeBSD_version / 100000) % 100;
static const int minor = (__FreeBSD_version / 1000) % 100;
static const int Rxx = __FreeBSD_version % 1000;
- if ((major < 9 && Rxx == 0) ||
- __FreeBSD_version == 900044 || __FreeBSD_version == 901000)
+ if ((major < 9 && Rxx == 0))
return StringUtils::Format("version %d.%d-RELEASE", major, minor);
if (Rxx >= 500)
return StringUtils::Format("version %d.%d-STABLE", major, minor);