Build fixes for MSVC.

CMakeLists.txt

@@ -37,7 +37,11 @@ endif()
 if (MSVC)
    set (BSON_OS 2)
    set (BSON_HAVE_CLOCK_GETTIME 0)
-   set (BSON_HAVE_SNPRINTF 0)
+   if (MSVC14)
+       set (BSON_HAVE_SNPRINTF 1)
+   else()
+       set (BSON_HAVE_SNPRINTF 0)
+   endif()
    set (BSON_HAVE_STDBOOL_H 0)
    set (BSON_HAVE_STRNLEN 0)
 else ()

src/bson/bson.c

@@ -19,6 +19,11 @@
 #include <string.h>
 #include <math.h>
 
+#if defined(_MSC_VER) && (_MSC_VER >= 1400 && _MSC_VER < 1900)
+#define NEEDS_SET_TWO_DIGIT_EXPONENT
+#include <stdio.h> // _set_output_format and _TWO_DIGIT_EXPONENT Added in vs2005 and removed in vs2015.
+#endif
+
 #include "b64_ntop.h"
 #include "bson.h"
 #include "bson-private.h"
@@ -2346,13 +2351,13 @@ _bson_as_json_visit_double (const bson_iter_t *iter,
 {
    bson_json_state_t *state = data;
 
-#ifdef _MSC_VER
+#ifdef NEEDS_SET_TWO_DIGIT_EXPONENT
    unsigned int current_format = _set_output_format(_TWO_DIGIT_EXPONENT);
 #endif
 
    bson_string_append_printf (state->str, "%.15g", v_double);
 
-#ifdef _MSC_VER
+#ifdef NEEDS_SET_TWO_DIGIT_EXPONENT
    _set_output_format(current_format);
 #endif
 

tests/TestSuite.c

@@ -85,7 +85,7 @@
 # define AtomicInt_DecrementAndTest(p) (bson_atomic_int_add(p, -1) == 0)
 
 
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && _MSC_VER < 1900
 struct timespec
 {
    time_t tv_sec;

tests/test-bson.c

@@ -1076,6 +1076,7 @@ test_bson_new_from_buffer (void)
 static void
 test_bson_utf8_key (void)
 {
+#ifndef _MSC_VER
    uint32_t length;
    bson_iter_t iter;
    const char *str;
@@ -1091,6 +1092,7 @@ test_bson_utf8_key (void)
    assert(length == 15); /* 5 3-byte sequences. */
    assert(!strcmp(str, "€€€€€"));
    bson_destroy(b);
+#endif
 }
 
 

tests/test-json.c

@@ -142,6 +142,7 @@ test_bson_as_json_double (void)
 static void
 test_bson_as_json_utf8 (void)
 {
+#ifndef _MSC_VER
    size_t len;
    bson_t *b;
    char *str;
@@ -152,6 +153,7 @@ test_bson_as_json_utf8 (void)
    assert(!strcmp(str, "{ \"€€€€€\" : \"€€€€€\" }"));
    bson_free(str);
    bson_destroy(b);
+#endif
 }