summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar Apology112015-07-12 13:12:14 +0200
committerGravatar Apology112015-07-12 13:12:14 +0200
commitaf18572491ba630e24f5c7dacf0d2d5a08929a6a (patch)
tree2159e768117b8fa8c1deba059a0ed7efd888cc08 /src
parentMerge pull request #823 from Subv/applets_drawing (diff)
downloadyuzu-af18572491ba630e24f5c7dacf0d2d5a08929a6a.tar.gz
yuzu-af18572491ba630e24f5c7dacf0d2d5a08929a6a.tar.xz
yuzu-af18572491ba630e24f5c7dacf0d2d5a08929a6a.zip
don“t define snprintf on Visual Studio 2015
Visual Studio 2015 defines this in stdio now
Diffstat (limited to 'src')
-rw-r--r--src/common/common_funcs.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/common/common_funcs.h b/src/common/common_funcs.h
index c4fb3d9cc..59bd16dbf 100644
--- a/src/common/common_funcs.h
+++ b/src/common/common_funcs.h
@@ -69,8 +69,10 @@ inline u64 _rotr64(u64 x, unsigned int shift){
69} 69}
70 70
71#else // _MSC_VER 71#else // _MSC_VER
72 // Function Cross-Compatibility 72 #if (_MSC_VER < 1900)
73 #define snprintf _snprintf 73 // Function Cross-Compatibility
74 #define snprintf _snprintf
75 #endif
74 76
75 // Locale Cross-Compatibility 77 // Locale Cross-Compatibility
76 #define locale_t _locale_t 78 #define locale_t _locale_t