summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Parlane <parlane@gmail.com>2012-12-23 20:25:11 +1300
committerMatthew Parlane <parlane@gmail.com>2012-12-23 20:25:11 +1300
commite3eebdf5911cb89c846edfe9a6eb3dfda790ff2b (patch)
tree77cac5d1f4a782081c55fb63e0a2bd4aa388a273
parent089434b719750b4fc3e173b0cb2a25d6021ec377 (diff)
Fixes swprintf_s issues hopefully.
Also fixed an include not using correct caps. According to: http://connect.microsoft.com/VisualStudio/feedback/details/646532
-rw-r--r--Source/Plugins/Plugin_VideoDX11/Src/Render.cpp2
-rw-r--r--Source/Plugins/Plugin_VideoDX9/Src/Render.cpp4
-rw-r--r--Source/Plugins/Plugin_VideoDX9/Src/main.cpp2
3 files changed, 5 insertions, 3 deletions
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp b/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp
index fb4a07e31e..830f16a9f6 100644
--- a/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp
+++ b/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp
@@ -16,7 +16,6 @@
// http://code.google.com/p/dolphin-emu/
#include <math.h>
-#include <strsafe.h>
#include "Timer.h"
@@ -46,6 +45,7 @@
#include "AVIDump.h"
#include "FPSCounter.h"
#include "ConfigManager.h"
+#include <strsafe.h>
namespace DX11
{
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp b/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp
index b9ba968211..a26b041ba0 100644
--- a/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp
+++ b/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp
@@ -17,7 +17,6 @@
#include <list>
#include <d3dx9.h>
-#include <strsafe.h>
#include "StringUtil.h"
#include "Common.h"
@@ -57,6 +56,9 @@
#include "FPSCounter.h"
#include "ConfigManager.h"
+#include <strsafe.h>
+
+
namespace DX9
{
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/main.cpp b/Source/Plugins/Plugin_VideoDX9/Src/main.cpp
index d3fd6050bf..5a80100a08 100644
--- a/Source/Plugins/Plugin_VideoDX9/Src/main.cpp
+++ b/Source/Plugins/Plugin_VideoDX9/Src/main.cpp
@@ -49,7 +49,7 @@
#include "D3DUtil.h"
#include "EmuWindow.h"
#include "VideoState.h"
-#include "render.h"
+#include "Render.h"
#include "DLCache.h"
#include "IniFile.h"
#include "Core.h"