Bug 1120772: Avoid defining snprintf when MSVC provides it (NSPR), r=ted NSPR_4_10_8_BETA3
authorBrian Smith <brian@briansmith.org>
Mon, 12 Jan 2015 19:09:27 -0800
changeset 4610 e27c8f0bdd5dc7375a7bfaefd19e4e4d0c5415ec
parent 4609 3674f6efcd2edcec75f3c6475476047f26e19951
child 4611 ab846cd2b37954d622f03cd4c7a3dc5a3b1cf48f
push id153
push userbrian@briansmith.org
push dateTue, 13 Jan 2015 03:18:07 +0000
reviewersted
bugs1120772
Bug 1120772: Avoid defining snprintf when MSVC provides it (NSPR), r=ted
pr/src/io/prprf.c
--- a/pr/src/io/prprf.c
+++ b/pr/src/io/prprf.c
@@ -13,17 +13,17 @@
 #include <stdio.h>
 #include <string.h>
 #include "primpl.h"
 #include "prprf.h"
 #include "prlong.h"
 #include "prlog.h"
 #include "prmem.h"
 
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && _MSC_VER < 1900
 #define snprintf _snprintf
 #endif
 
 /*
 ** WARNING: This code may *NOT* call PR_LOG (because PR_LOG calls it)
 */
 
 /*