Merge pull request grishka#46 from mymedia2/patch-2

Add conditions for FreeBSD and GNU/Hurd
TelegramMessengerOrg · Jul 1, 2018 · dacde29 · dacde29
2 parents 697eea9 + c5f8db2
commit dacde29
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 7 deletions.
diff --git a/audio/AudioInput.cpp b/audio/AudioInput.cpp
@@ -19,7 +19,7 @@
 #include "../os/windows/AudioInputWave.h"
 #endif
 #include "../os/windows/AudioInputWASAPI.h"
-#elif defined(__linux__)
+#elif defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__gnu_hurd__)
 #include "../os/linux/AudioInputALSA.h"
 #include "../os/linux/AudioInputPulse.h"
 #else

diff --git a/audio/AudioOutput.cpp b/audio/AudioOutput.cpp
@@ -22,7 +22,7 @@
 #include "../os/windows/AudioOutputWave.h"
 #endif
 #include "../os/windows/AudioOutputWASAPI.h"
-#elif defined(__linux__)
+#elif defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__gnu_hurd__)
 #include "../os/linux/AudioOutputALSA.h"
 #include "../os/linux/AudioOutputPulse.h"
 #else

diff --git a/os/linux/AudioInputPulse.cpp b/os/linux/AudioInputPulse.cpp
@@ -46,6 +46,9 @@ AudioInputPulse::AudioInputPulse(std::string devID){
 		return;
 	}
 	mainloopApi=pa_threaded_mainloop_get_api(mainloop);
+#ifndef MAXPATHLEN
+	char exeName[20];
+#else
 	char exePath[MAXPATHLEN];
 	char exeName[MAXPATHLEN];
 	ssize_t lres=readlink("/proc/self/exe", exePath, sizeof(exePath));
@@ -55,7 +58,9 @@ AudioInputPulse::AudioInputPulse(std::string devID){
 		lres=readlink("/proc/curproc/exe", exePath, sizeof(exePath));
 	if(lres>0){
 		strcpy(exeName, basename(exePath));
-	}else{
+	}else
+#endif
+	{
 		snprintf(exeName, sizeof(exeName), "Process %d", getpid());
 	}
 	context=pa_context_new(mainloopApi, exeName);

diff --git a/os/linux/AudioOutputPulse.cpp b/os/linux/AudioOutputPulse.cpp
@@ -50,6 +50,9 @@ AudioOutputPulse::AudioOutputPulse(std::string devID){
 		return;
 	}
 	mainloopApi=pa_threaded_mainloop_get_api(mainloop);
+#ifndef MAXPATHLEN
+	char exeName[20];
+#else
 	char exePath[MAXPATHLEN];
 	char exeName[MAXPATHLEN];
 	ssize_t lres=readlink("/proc/self/exe", exePath, sizeof(exePath));
@@ -59,7 +62,9 @@ AudioOutputPulse::AudioOutputPulse(std::string devID){
 		lres=readlink("/proc/curproc/exe", exePath, sizeof(exePath));
 	if(lres>0){
 		strcpy(exeName, basename(exePath));
-	}else{
+	}else
+#endif
+	{
 		snprintf(exeName, sizeof(exeName), "Process %d", getpid());
 	}
 	context=pa_context_new(mainloopApi, exeName);

diff --git a/os/posix/NetworkSocketPosix.cpp b/os/posix/NetworkSocketPosix.cpp
@@ -53,7 +53,7 @@ void NetworkSocketPosix::SetMaxPriority(){
 	if(res<0){
 		LOGE("error setting darwin-specific net priority: %d / %s", errno, strerror(errno));
 	}
-#else
+#elif defined(__linux__)
 	int prio=5;
 	int res=setsockopt(fd, SOL_SOCKET, SO_PRIORITY, &prio, sizeof(prio));
 	if(res<0){
@@ -64,6 +64,8 @@ void NetworkSocketPosix::SetMaxPriority(){
 	if(res<0){
 		LOGE("error setting ip tos: %d / %s", errno, strerror(errno));
 	}
+#else
+	LOGI("cannot set socket priority");
 #endif
 }
 

diff --git a/threading.h b/threading.h
@@ -94,9 +94,9 @@ namespace tgvoip{
 		static void* ActualEntryPoint(void* arg){
 			Thread* self=reinterpret_cast<Thread*>(arg);
 			if(self->name){
-#ifndef __APPLE__
+#if !defined(__APPLE__) && !defined(__gnu_hurd__)
 				pthread_setname_np(self->thread, self->name);
-#else
+#elif !defined(__gnu_hurd__)
 				pthread_setname_np(self->name);
 #endif
 			}