From 6cc758b6e29909f2c28a602bfb7f7041898d6ca0 Mon Sep 17 00:00:00 2001
From: Victor Zverovich <victor.zverovich@gmail.com>
Date: Wed, 27 Feb 2013 14:17:07 -0800
Subject: [PATCH] Workaround MSCRT brain damage, take 2.

---
 format.h | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/format.h b/format.h
index 90d57457..a6c1ef88 100644
--- a/format.h
+++ b/format.h
@@ -40,11 +40,6 @@
 #include <string>
 #include <sstream>
 
-#ifndef _CRT_SECURE_NO_WARNINGS
-# define _CRT_SECURE_NO_WARNINGS
-# define FMT_RESTORE_WARNINGS
-#endif
-
 namespace fmt {
 
 namespace internal {
@@ -188,6 +183,8 @@ inline int IsInf(double x) {
 #endif
 }
 
+#define FMT_SNPRINTF snprintf
+
 #else
 
 inline int SignBit(double value) {
@@ -200,8 +197,7 @@ inline int SignBit(double value) {
 
 inline int IsInf(double x) { return !_finite(x); }
 
-# undef snprintf
-# define snprintf _snprintf
+#define FMT_SNPRINTF sprintf_s
 
 #endif
 
@@ -698,12 +694,13 @@ void BasicWriter<Char>::FormatDouble(
     Char *start = &buffer_[offset];
     if (width_for_sprintf == 0) {
       n = precision < 0 ?
-          snprintf(start, size, format, value) :
-          snprintf(start, size, format, precision, value);
+          FMT_SNPRINTF(start, size, format, value) :
+          FMT_SNPRINTF(start, size, format, precision, value);
     } else {
       n = precision < 0 ?
-          snprintf(start, size, format, width_for_sprintf, value) :
-          snprintf(start, size, format, width_for_sprintf, precision, value);
+          FMT_SNPRINTF(start, size, format, width_for_sprintf, value) :
+          FMT_SNPRINTF(start, size, format, width_for_sprintf,
+              precision, value);
     }
     if (n >= 0 && offset + n < buffer_.capacity()) {
       if (sign) {
@@ -1552,8 +1549,4 @@ void BasicFormatter<Char>::DoFormat() {
 }
 }
 
-#ifndef FMT_RESTORE_WARNINGS
-# undef _CRT_SECURE_NO_WARNINGS
-#endif
-
 #endif  // FORMAT_H_