diff options
| author |  Yuri Kunde Schlesner | 2015-07-12 15:02:11 -0700 |
|---|---|---|
| committer | Yuri Kunde Schlesner | 2015-07-12 15:02:11 -0700 |
| commit | c4e11519afb8c51b591b88f6bfa531b04d15d588 (patch) | |
| tree | 05a804cea4cb12b53749cf294d7bf409de53a354 /src | |
| parent | Merge pull request #921 from linkmauve/fix-applet (diff) | |
| parent | don´t define snprintf on Visual Studio 2015 (diff) | |
| download | yuzu-c4e11519afb8c51b591b88f6bfa531b04d15d588.tar.gz yuzu-c4e11519afb8c51b591b88f6bfa531b04d15d588.tar.xz yuzu-c4e11519afb8c51b591b88f6bfa531b04d15d588.zip | |
Merge pull request #859 from Apology11/master
build with visual studio 2015
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/common_funcs.h | 6 |
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 |