aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/common
diff options
context:
space:
mode:
authorGravatar Yuri Kunde Schlesner <yuriks@yuriks.net>2015-07-12 15:02:11 -0700
committerGravatar Yuri Kunde Schlesner <yuriks@yuriks.net>2015-07-12 15:02:11 -0700
commitc4e11519afb8c51b591b88f6bfa531b04d15d588 (patch)
tree05a804cea4cb12b53749cf294d7bf409de53a354 /src/common
parentb6719ec922ce807510932887b80e61aeeec2fc7b (diff)
parentaf18572491ba630e24f5c7dacf0d2d5a08929a6a (diff)
Merge pull request #859 from Apology11/master
build with visual studio 2015
Diffstat (limited to 'src/common')
-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 c4fb3d9c..59bd16db 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){
}
#else // _MSC_VER
- // Function Cross-Compatibility
- #define snprintf _snprintf
+ #if (_MSC_VER < 1900)
+ // Function Cross-Compatibility
+ #define snprintf _snprintf
+ #endif
// Locale Cross-Compatibility
#define locale_t _locale_t