From 7a7b3527932d4ef5ff7d1676f8af022ae28cbdf5 Mon Sep 17 00:00:00 2001
From: blingu <36486731+blingu@users.noreply.github.com>
Date: Wed, 5 Aug 2020 14:32:37 +0200
Subject: added FreeBSD support

---
 src/core/CdStreamPosix.cpp | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/core/CdStreamPosix.cpp b/src/core/CdStreamPosix.cpp
index 45fd9832..ff36c18f 100644
--- a/src/core/CdStreamPosix.cpp
+++ b/src/core/CdStreamPosix.cpp
@@ -150,9 +150,11 @@ CdStreamInit(int32 numChannels)
         ASSERT(0);
         return;
     }
-
+#ifdef __linux__
 	_gdwCdStreamFlags = O_RDONLY | O_NOATIME;
-
+#elif __FreeBSD__
+	_gdwCdStreamFlags = O_RDONLY;
+#endif
 	// People say it's slower
 /*
 	if ( fsInfo.f_bsize <= CDSTREAM_SECTOR_SIZE )
@@ -400,9 +402,12 @@ void *CdStreamThread(void *param)
         if (gCdStreamThreadStatus == 0){
             gCdStreamThreadStatus = 1;
 #endif
+
+#ifdef __linux__
             pid_t tid = syscall(SYS_gettid);
             int ret = setpriority(PRIO_PROCESS, tid, getpriority(PRIO_PROCESS, getpid()) + 1);
-        }
+#endif
+	}
 
 		// spurious wakeup or we sent interrupt signal for flushing
 		if(pChannel->nSectorsToRead == 0)
-- 
cgit v1.2.3


From c4f9bfdc441fb0a0d6bfde208cd1f8192bacc880 Mon Sep 17 00:00:00 2001
From: blingu <36486731+blingu@users.noreply.github.com>
Date: Wed, 5 Aug 2020 14:33:50 +0200
Subject: added FreeBSD support

---
 src/skel/glfw/glfw.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src')

diff --git a/src/skel/glfw/glfw.cpp b/src/skel/glfw/glfw.cpp
index a1170c61..643a9e64 100644
--- a/src/skel/glfw/glfw.cpp
+++ b/src/skel/glfw/glfw.cpp
@@ -209,7 +209,11 @@ double
 psTimer(void)
 {
 	struct timespec start; 
+#ifdef __linux__
 	clock_gettime(CLOCK_MONOTONIC_RAW, &start);
+#elif __FreeBSD__
+	clock_gettime(CLOCK_MONOTONIC, &start);
+#endif
 	return start.tv_sec * 1000.0 + start.tv_nsec/1000000.0;
 }
 #endif       
-- 
cgit v1.2.3


From 56ea53a5db82887163eb76388ad936f71788490e Mon Sep 17 00:00:00 2001
From: blingu <36486731+blingu@users.noreply.github.com>
Date: Wed, 5 Aug 2020 14:35:24 +0200
Subject: clang throws an error if fixed comparisons are against NULL

---
 src/audio/sampman_oal.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/audio/sampman_oal.cpp b/src/audio/sampman_oal.cpp
index 0e173152..5e4b5aba 100644
--- a/src/audio/sampman_oal.cpp
+++ b/src/audio/sampman_oal.cpp
@@ -587,16 +587,16 @@ cSampleManager::Initialise(void)
 		}
 		
 		nSampleBankMemoryStartAddress[SAMPLEBANK_MAIN] = (uintptr)malloc(nSampleBankSize[SAMPLEBANK_MAIN]);
-		ASSERT(nSampleBankMemoryStartAddress[SAMPLEBANK_MAIN] != NULL);
+		ASSERT(nSampleBankMemoryStartAddress[SAMPLEBANK_MAIN] != 0);
 		
-		if ( nSampleBankMemoryStartAddress[SAMPLEBANK_MAIN] == NULL )
+		if ( nSampleBankMemoryStartAddress[SAMPLEBANK_MAIN] == 0 )
 		{
 			Terminate();
 			return false;
 		}
 		
 		nSampleBankMemoryStartAddress[SAMPLEBANK_PED] = (uintptr)malloc(PED_BLOCKSIZE*MAX_PEDSFX);
-		ASSERT(nSampleBankMemoryStartAddress[SAMPLEBANK_PED] != NULL);
+		ASSERT(nSampleBankMemoryStartAddress[SAMPLEBANK_PED] != 0);
 	}
 	
 	
-- 
cgit v1.2.3


From 4b6cc0188bcbfa0469d2d1d7ed674945e243b5cb Mon Sep 17 00:00:00 2001
From: blingu <36486731+blingu@users.noreply.github.com>
Date: Fri, 7 Aug 2020 17:51:15 +0200
Subject: Update CdStreamPosix.cpp

---
 src/core/CdStreamPosix.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/core/CdStreamPosix.cpp b/src/core/CdStreamPosix.cpp
index ff36c18f..e114a29a 100644
--- a/src/core/CdStreamPosix.cpp
+++ b/src/core/CdStreamPosix.cpp
@@ -152,7 +152,7 @@ CdStreamInit(int32 numChannels)
     }
 #ifdef __linux__
 	_gdwCdStreamFlags = O_RDONLY | O_NOATIME;
-#elif __FreeBSD__
+#else
 	_gdwCdStreamFlags = O_RDONLY;
 #endif
 	// People say it's slower
-- 
cgit v1.2.3


From 8392b9ad2fc578fd42dc9b5fa27a5da175bf92f5 Mon Sep 17 00:00:00 2001
From: blingu <36486731+blingu@users.noreply.github.com>
Date: Fri, 7 Aug 2020 17:51:43 +0200
Subject: Update glfw.cpp

---
 src/skel/glfw/glfw.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/skel/glfw/glfw.cpp b/src/skel/glfw/glfw.cpp
index 643a9e64..ed442348 100644
--- a/src/skel/glfw/glfw.cpp
+++ b/src/skel/glfw/glfw.cpp
@@ -211,7 +211,7 @@ psTimer(void)
 	struct timespec start; 
 #ifdef __linux__
 	clock_gettime(CLOCK_MONOTONIC_RAW, &start);
-#elif __FreeBSD__
+#else
 	clock_gettime(CLOCK_MONOTONIC, &start);
 #endif
 	return start.tv_sec * 1000.0 + start.tv_nsec/1000000.0;
-- 
cgit v1.2.3