summaryrefslogtreecommitdiff
path: root/Source
diff options
context:
space:
mode:
authorRyan Houdek <Sonicadvance1@gmail.com>2012-12-30 04:32:37 -0600
committerRyan Houdek <Sonicadvance1@gmail.com>2012-12-30 04:32:37 -0600
commit64afbade33f0c048472a214ef3841c6687eadeeb (patch)
treed4f9fccd4a7998e32e5d3dd5cc91c7ff617c9228 /Source
parentff3b22e1ff8a29fb70c06b5037f3d31f93b7ff14 (diff)
Fix 4 warnings on OSX
Diffstat (limited to 'Source')
-rw-r--r--Source/Core/DolphinWX/Src/GLInterface/WX.cpp1
-rw-r--r--Source/Plugins/Plugin_VideoSoftware/Src/EfbInterface.cpp2
2 files changed, 2 insertions, 1 deletions
diff --git a/Source/Core/DolphinWX/Src/GLInterface/WX.cpp b/Source/Core/DolphinWX/Src/GLInterface/WX.cpp
index 0db1f8d632..d5415c8ed9 100644
--- a/Source/Core/DolphinWX/Src/GLInterface/WX.cpp
+++ b/Source/Core/DolphinWX/Src/GLInterface/WX.cpp
@@ -50,6 +50,7 @@ bool cInterfaceWX::Create(void *&window_handle)
GLWin.glCanvas->Show(true);
if (GLWin.glCtxt == NULL) // XXX dirty hack
GLWin.glCtxt = new wxGLContext(GLWin.glCanvas);
+ return true;
}
bool cInterfaceWX::MakeCurrent()
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/EfbInterface.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/EfbInterface.cpp
index f2631c9238..6722ec7935 100644
--- a/Source/Plugins/Plugin_VideoSoftware/Src/EfbInterface.cpp
+++ b/Source/Plugins/Plugin_VideoSoftware/Src/EfbInterface.cpp
@@ -355,7 +355,7 @@ namespace EfbInterface
dstClr = (~srcClr) & dstClr;
break;
case 5: // noop
- dstClr = dstClr;
+ // Do nothing
break;
case 6: // xor
dstClr = srcClr ^ dstClr;