From 2ef8e9a2025fb522825cd8b39af331a2faae2f1f Mon Sep 17 00:00:00 2001
From: athrxx <athrxx@scummvm.org>
Date: Fri, 20 May 2011 16:21:39 +0200
Subject: [PATCH] FM-TOWNS AUDIO: fix gcc warnings

---
 audio/softsynth/fmtowns_pc98/towns_audio.cpp        | 4 ++--
 audio/softsynth/fmtowns_pc98/towns_pc98_fmsynth.cpp | 8 ++++----
 audio/softsynth/fmtowns_pc98/towns_pc98_fmsynth.h   | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/audio/softsynth/fmtowns_pc98/towns_audio.cpp b/audio/softsynth/fmtowns_pc98/towns_audio.cpp
index 635f9354cc6..5161871601a 100644
--- a/audio/softsynth/fmtowns_pc98/towns_audio.cpp
+++ b/audio/softsynth/fmtowns_pc98/towns_audio.cpp
@@ -1890,9 +1890,9 @@ void TownsAudioInterface::setSoundEffectChanMask(int mask) {
 }
 
 void TownsAudioInterface::lockInternal() {
-	_intf->lock();
+	_intf->mutexLock();
 }
 
 void TownsAudioInterface::unlockInternal() {
-	_intf->unlock();
+	_intf->mutexUnlock();
 }
diff --git a/audio/softsynth/fmtowns_pc98/towns_pc98_fmsynth.cpp b/audio/softsynth/fmtowns_pc98/towns_pc98_fmsynth.cpp
index b09a9f65d19..4336de9bdbf 100644
--- a/audio/softsynth/fmtowns_pc98/towns_pc98_fmsynth.cpp
+++ b/audio/softsynth/fmtowns_pc98/towns_pc98_fmsynth.cpp
@@ -1147,7 +1147,7 @@ int TownsPC98_FmSynth::readBuffer(int16 *buffer, const int numSamples) {
 
 	bool locked = false;
 	if (_ready) {
-		lock();
+		mutexLock();
 		locked = true;
 	}
 
@@ -1201,7 +1201,7 @@ int TownsPC98_FmSynth::readBuffer(int16 *buffer, const int numSamples) {
 	}
 
 	if (locked)
-		unlock();
+		mutexUnlock();
 
 	delete[] tmpStart;
 
@@ -1220,11 +1220,11 @@ int TownsPC98_FmSynth::getRate() const {
 	return _mixer->getOutputRate();
 }
 
-void TownsPC98_FmSynth::lock() {
+void TownsPC98_FmSynth::mutexLock() {
 	_mutex.lock();
 }
 
-void TownsPC98_FmSynth::unlock() {
+void TownsPC98_FmSynth::mutexUnlock() {
 	_mutex.unlock();
 }
 
diff --git a/audio/softsynth/fmtowns_pc98/towns_pc98_fmsynth.h b/audio/softsynth/fmtowns_pc98/towns_pc98_fmsynth.h
index a1b09abd3a9..6ea9815a729 100644
--- a/audio/softsynth/fmtowns_pc98/towns_pc98_fmsynth.h
+++ b/audio/softsynth/fmtowns_pc98/towns_pc98_fmsynth.h
@@ -73,8 +73,8 @@ public:
 	bool endOfData() const;
 	int getRate() const;
 
-	void lock();
-	void unlock();
+	void mutexLock();
+	void mutexUnlock();
 
 protected:
 	void deinit();