From 0d6407bef2e6a520b0cd8924290a66aff8fc682e Mon Sep 17 00:00:00 2001 From: Klemens Nanni Date: Fri, 17 Dec 2021 23:59:17 +0100 Subject: [PATCH 1/2] logging: fix systemVersion detection on OpenBSD --- logging.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/logging.cpp b/logging.cpp index 0baf7f95..d2ab8db1 100644 --- a/logging.cpp +++ b/logging.cpp @@ -13,7 +13,7 @@ #ifdef __ANDROID__ #include -#elif defined(__linux__) || defined(__FreeBSD__) +#elif defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__) #include #endif @@ -51,7 +51,7 @@ void tgvoip_log_file_write_header(FILE* file){ #else char* systemVersion="Windows RT"; #endif -#elif defined(__linux__) || defined(__FreeBSD__) +#elif defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__) #ifdef __ANDROID__ char systemVersion[128]; char sysRel[PROP_VALUE_MAX]; From 12617acffc3f00f785469870beff1aab7d6eca82 Mon Sep 17 00:00:00 2001 From: Klemens Nanni Date: Sat, 18 Dec 2021 00:00:14 +0100 Subject: [PATCH 2/2] threading: set thread names on OpenBSD While here, use `#if defined()` rather than `#ifdef` like the rest of the code. --- threading.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/threading.h b/threading.h index 37de500d..7da4fb24 100755 --- a/threading.h +++ b/threading.h @@ -15,10 +15,9 @@ #include #include #include -#ifdef __APPLE__ +#if defined(__APPLE__) #include "os/darwin/DarwinSpecific.h" -#endif -#ifdef __FreeBSD__ +#elif defined(__FreeBSD__) || defined(__OpenBSD__) #include #endif @@ -97,6 +96,8 @@ namespace tgvoip{ if(self->name){ #if defined(__linux__) || defined(__FreeBSD__) pthread_setname_np(self->thread, self->name); +#elif defined(__OpenBSD__) + pthread_set_name_np(self->thread, self->name); #elif defined(__APPLE__) pthread_setname_np(self->name); if(self->maxPriority){