diff --git a/libdnet-stripped/include/dnet_winconfig.h b/libdnet-stripped/include/dnet_winconfig.h
index f0b2310e3..dff336dcc 100644
--- a/libdnet-stripped/include/dnet_winconfig.h
+++ b/libdnet-stripped/include/dnet_winconfig.h
@@ -269,8 +269,10 @@ int	strlcpy(char *, const char *, int);
 #ifndef HAVE_STRSEP
 char	*strsep(char **, const char *);
 #endif
-
-#define snprintf _snprintf
+
+#if defined(_MSC_VER) && _MSC_VER < 1900
+#define snprintf _snprintf
+#endif
 
 /* Without this, Windows will give us all sorts of crap about using functions
    like strcpy() even if they are done safely */
diff --git a/nbase/nbase.h b/nbase/nbase.h
index 41090f2f0..2c80d740b 100644
--- a/nbase/nbase.h
+++ b/nbase/nbase.h
@@ -292,7 +292,7 @@ extern "C" int vsnprintf (char *, size_t, const char *, va_list);
 #define putenv _putenv
 #define tzset _tzset
 
-#if !defined(__GNUC__)
+#if defined(_MSC_VER) && _MSC_VER < 1900
 #define snprintf _snprintf
 #endif