From 92fb77d50ed725155718d5076fa82312d801fa54 Mon Sep 17 00:00:00 2001
From: Bigpet <dravorek@gmail.com>
Date: Sun, 23 Feb 2014 20:05:49 +0100
Subject: [PATCH] more merge fixes, I should really compile it before
 submitting a pull request

---
 rpcs3/Emu/Event.cpp                   |  6 +++---
 rpcs3/Emu/GS/GL/GLGSRender.cpp        |  2 +-
 rpcs3/Emu/SysCalls/Modules/cellAdec.h | 18 +++++++++---------
 rpcs3/Emu/SysCalls/lv2/SC_Lwmutex.cpp |  6 +++---
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/rpcs3/Emu/Event.cpp b/rpcs3/Emu/Event.cpp
index e31e2601fa..a1fee9d086 100644
--- a/rpcs3/Emu/Event.cpp
+++ b/rpcs3/Emu/Event.cpp
@@ -26,9 +26,9 @@ bool EventManager::RegisterKey(EventQueue* data, u64 key)
 
 	if (key_map.find(key) != key_map.end()) return false;
 
-	for (auto& v = key_map.begin(); v != key_map.end(); ++v)
+	for (auto& v : key_map)
 	{
-		if (v->second == data) return false;
+		if (v.second == data) return false;
 	}
 
 	key_map[key] = data;
@@ -79,4 +79,4 @@ bool EventManager::SendEvent(u64 key, u64 source, u64 d1, u64 d2, u64 d3)
 
 	eq->events.push(source, d1, d2, d3);
 	return true;
-}
\ No newline at end of file
+}
diff --git a/rpcs3/Emu/GS/GL/GLGSRender.cpp b/rpcs3/Emu/GS/GL/GLGSRender.cpp
index be30d8e121..442942f881 100644
--- a/rpcs3/Emu/GS/GL/GLGSRender.cpp
+++ b/rpcs3/Emu/GS/GL/GLGSRender.cpp
@@ -652,7 +652,7 @@ void GLGSRender::OnInitThread()
 	glSwapInterval(Ini.GSVSyncEnable.GetValue() ? 1 : 0);
 #else
 	if (GLXDrawable drawable = glXGetCurrentDrawable()){
-		//glXSwapIntervalEXT(glXGetCurrentDisplay(), drawable, Ini.GSVSyncEnable.GetValue() ? 1 : 0);
+		glXSwapIntervalEXT(glXGetCurrentDisplay(), drawable, Ini.GSVSyncEnable.GetValue() ? 1 : 0);
 	}
 #endif
 	glGenTextures(1, &g_depth_tex);
diff --git a/rpcs3/Emu/SysCalls/Modules/cellAdec.h b/rpcs3/Emu/SysCalls/Modules/cellAdec.h
index 9f9e633110..e05a394561 100644
--- a/rpcs3/Emu/SysCalls/Modules/cellAdec.h
+++ b/rpcs3/Emu/SysCalls/Modules/cellAdec.h
@@ -524,16 +524,16 @@ struct CellAdecParamM4Aac
 	be_t<MPEG4AAC_ConfigType> configNumber;
 
 	union {
-		struct { struct
+		struct
 		{
 			be_t<u32> adifProgramNumber; // 0
-		} adifConfig; };
+		} adifConfig;
 
-		struct { struct
+		struct
 		{
 			be_t<MPEG4AAC_SamplingFreq> samplingFreqIndex;
 			be_t<u32> profile; // LC profile (1)
-		} rawDataBlockConfig; };
+		} rawDataBlockConfig;
 	} configInfo;
 
 	be_t<u32> enableDownmix; // enable downmix to 2.0 (if (enableDownmix))
@@ -557,7 +557,7 @@ struct CellAdecM4AacInfo
 	be_t<u32> pad1; // TODO: check alignment
 
 	union {
-		struct { struct
+		struct
 		{
 			be_t<u32> copyrightIdPresent;
 			char copyrightId[9];
@@ -567,9 +567,9 @@ struct CellAdecM4AacInfo
 			be_t<u32> bitrate;
 			be_t<u32> numberOfProgramConfigElements;
 			be_t<u32> bufferFullness;
-		} adif; };
+		} adif;
 
-		struct { struct
+		struct
 		{
 			be_t<u32> id;
 			be_t<u32> layer;
@@ -586,7 +586,7 @@ struct CellAdecM4AacInfo
 			be_t<u32> bufferFullness;
 			be_t<u32> numberOfRawDataBlocks;
 			be_t<u32> crcCheck;
-		} adts; };
+		} adts;
 	} bsi;
 
 	be_t<u32> pad2; // TODO: check alignment
@@ -980,4 +980,4 @@ struct CellAdecMpmcInfo
 	be_t<u32> multiCodecMode;
 	be_t<u32> lfePresent;
 	be_t<u32> channelCoufiguration;
-};
\ No newline at end of file
+};
diff --git a/rpcs3/Emu/SysCalls/lv2/SC_Lwmutex.cpp b/rpcs3/Emu/SysCalls/lv2/SC_Lwmutex.cpp
index e08f0a34fb..872d2053f1 100644
--- a/rpcs3/Emu/SysCalls/lv2/SC_Lwmutex.cpp
+++ b/rpcs3/Emu/SysCalls/lv2/SC_Lwmutex.cpp
@@ -54,10 +54,10 @@ int sys_lwmutex_destroy(mem_ptr_t<sys_lwmutex_t> lwmutex)
 	if (!Emu.GetIdManager().CheckID(sq_id)) return CELL_ESRCH;
 
 	// try to make it unable to lock
-	switch (int res = lwmutex->trylock(lwmutex->owner.GetDeadValue())) 
+	switch (int res = lwmutex->trylock(lwmutex->vars.parts.owner.GetDeadValue()))
 	{
 	case CELL_OK:
-		lwmutex->all_info = 0;
+		lwmutex->vars.all_info = 0;
 		lwmutex->attribute = 0;
 		lwmutex->sleep_queue = 0;
 		Emu.GetIdManager().RemoveID(sq_id);
@@ -252,7 +252,7 @@ int sys_lwmutex_t::unlock(be_t<u32> tid)
 			case se32(SYS_SYNC_RETRY): break;
 			}
 			if (target) vars.parts.owner.unlock(tid, target);
-			else owner.unlock(tid);
+			else vars.parts.owner.unlock(tid);
 		}
 		return CELL_OK;
 	}