Merge pull request #6 from H-M-H/mac_fix

Fix compiling on mac. Thanks H-M-H :)
andreasgangso · Apr 14, 2016 · 7aa086d · 7aa086d
2 parents 8afced2 + 3b9df06
commit 7aa086d
Show file tree

Hide file tree

Showing 25 changed files with 17 additions and 2,934 deletions.
diff --git a/datasrc/__pycache__/content.cpython-32.pyc b/datasrc/__pycache__/content.cpython-32.pyc
diff --git a/datasrc/__pycache__/content.cpython-33.pyc b/datasrc/__pycache__/content.cpython-33.pyc
diff --git a/datasrc/__pycache__/content.cpython-34.pyc b/datasrc/__pycache__/content.cpython-34.pyc
diff --git a/datasrc/__pycache__/content.cpython-35.pyc b/datasrc/__pycache__/content.cpython-35.pyc
diff --git a/datasrc/__pycache__/datatypes.cpython-32.pyc b/datasrc/__pycache__/datatypes.cpython-32.pyc
diff --git a/datasrc/__pycache__/datatypes.cpython-33.pyc b/datasrc/__pycache__/datatypes.cpython-33.pyc
diff --git a/datasrc/__pycache__/datatypes.cpython-34.pyc b/datasrc/__pycache__/datatypes.cpython-34.pyc
diff --git a/datasrc/__pycache__/datatypes.cpython-35.pyc b/datasrc/__pycache__/datatypes.cpython-35.pyc
diff --git a/datasrc/__pycache__/network.cpython-32.pyc b/datasrc/__pycache__/network.cpython-32.pyc
diff --git a/datasrc/__pycache__/network.cpython-33.pyc b/datasrc/__pycache__/network.cpython-33.pyc
diff --git a/datasrc/__pycache__/network.cpython-34.pyc b/datasrc/__pycache__/network.cpython-34.pyc
diff --git a/datasrc/__pycache__/network.cpython-35.pyc b/datasrc/__pycache__/network.cpython-35.pyc
diff --git a/src/base/system.c b/src/base/system.c
@@ -370,7 +370,7 @@ int io_flush(IOHANDLE io)
 	return 0;
 }
 
-void *thread_create(void (*threadfunc)(void *), void *u)
+void *thread_init(void (*threadfunc)(void *), void *u)
 {
 #if defined(CONF_FAMILY_UNIX)
 	pthread_t id;
@@ -474,7 +474,7 @@ void lock_destroy(LOCK lock)
 	mem_free(lock);
 }
 
-int lock_try(LOCK lock)
+int lock_trylock(LOCK lock)
 {
 #if defined(CONF_FAMILY_UNIX)
 	return pthread_mutex_trylock((LOCKINTERNAL *)lock);
@@ -496,7 +496,7 @@ void lock_wait(LOCK lock)
 #endif
 }
 
-void lock_release(LOCK lock)
+void lock_unlock(LOCK lock)
 {
 #if defined(CONF_FAMILY_UNIX)
 	pthread_mutex_unlock((LOCKINTERNAL *)lock);

diff --git a/src/base/system.h b/src/base/system.h
@@ -352,15 +352,15 @@ IOHANDLE io_stderr();
 void thread_sleep(int milliseconds);
 
 /*
-	Function: thread_create
+	Function: thread_init
 		Creates a new thread.
 
 	Parameters:
 		threadfunc - Entry point for the new thread.
 		user - Pointer to pass to the thread.
 
 */
-void *thread_create(void (*threadfunc)(void *), void *user);
+void *thread_init(void (*threadfunc)(void *), void *user);
 
 /*
 	Function: thread_wait
@@ -403,9 +403,9 @@ typedef void* LOCK;
 LOCK lock_create();
 void lock_destroy(LOCK lock);
 
-int lock_try(LOCK lock);
+int lock_trylock(LOCK lock);
 void lock_wait(LOCK lock);
-void lock_release(LOCK lock);
+void lock_unlock(LOCK lock);
 
 
 /* Group: Semaphores */

diff --git a/src/base/tl/threading.h b/src/base/tl/threading.h
@@ -84,7 +84,7 @@ class lock
 	LOCK var;
 
 	void take() { lock_wait(var); }
-	void release() { lock_release(var); }
+	void release() { lock_unlock(var); }
 
 public:
 	lock()

diff --git a/src/engine/client/backend_sdl.cpp b/src/engine/client/backend_sdl.cpp
@@ -40,7 +40,7 @@ void CGraphicsBackend_Threaded::StartProcessor(ICommandProcessor *pProcessor)
 {
 	m_Shutdown = false;
 	m_pProcessor = pProcessor;
-	m_pThread = thread_create(ThreadFunc, this);
+	m_pThread = thread_init(ThreadFunc, this);
 	m_BufferDone.signal();
 }
 

diff --git a/src/engine/client/sound.cpp b/src/engine/client/sound.cpp
@@ -171,7 +171,7 @@ static void Mix(short *pFinalOut, unsigned Frames)
 
 
 	// release the lock
-	lock_release(m_SoundLock);
+	lock_unlock(m_SoundLock);
 
 	{
 		// clamp accumulated values
@@ -259,7 +259,7 @@ int CSound::Update()
 	{
 		lock_wait(m_SoundLock);
 		m_SoundVolume = WantedVolume;
-		lock_release(m_SoundLock);
+		lock_unlock(m_SoundLock);
 	}
 
 	return 0;
@@ -476,7 +476,7 @@ int CSound::Play(int ChannelID, int SampleID, int Flags, float x, float y)
 		m_aVoices[VoiceID].m_Y = (int)y;
 	}
 
-	lock_release(m_SoundLock);
+	lock_unlock(m_SoundLock);
 	return VoiceID;
 }
 
@@ -506,7 +506,7 @@ void CSound::Stop(int SampleID)
 			m_aVoices[i].m_pSample = 0;
 		}
 	}
-	lock_release(m_SoundLock);
+	lock_unlock(m_SoundLock);
 }
 
 void CSound::StopAll()
@@ -524,7 +524,7 @@ void CSound::StopAll()
 		}
 		m_aVoices[i].m_pSample = 0;
 	}
-	lock_release(m_SoundLock);
+	lock_unlock(m_SoundLock);
 }
 
 IOHANDLE CSound::ms_File = 0;

diff --git a/src/engine/shared/jobs.cpp b/src/engine/shared/jobs.cpp
@@ -30,7 +30,7 @@ void CJobPool::WorkerThread(void *pUser)
 			else
 				pPool->m_pLastJob = 0;
 		}
-		lock_release(pPool->m_Lock);
+		lock_unlock(pPool->m_Lock);
 
 		// do the job if we have one
 		if(pJob)
@@ -49,7 +49,7 @@ int CJobPool::Init(int NumThreads)
 {
 	// start threads
 	for(int i = 0; i < NumThreads; i++)
-		thread_create(WorkerThread, this);
+		thread_init(WorkerThread, this);
 	return 0;
 }
 
@@ -69,7 +69,7 @@ int CJobPool::Add(CJob *pJob, JOBFUNC pfnFunc, void *pData)
 	if(!m_pFirstJob)
 		m_pFirstJob = pJob;
 
-	lock_release(m_Lock);
+	lock_unlock(m_Lock);
 	return 0;
 }