From 3ec84c3cab8d6cb04f7d2d3b3d679dfd5c9b628b Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Mon, 29 Aug 2016 17:30:45 +0200
Subject: [PATCH 1/2] -Werror,-Wundef (__GNUC__ vs. clang-cl)

---
 src/librdf.h.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/librdf.h.in b/src/librdf.h.in
index 63848664..2e75b4a3 100644
--- a/src/librdf.h.in
+++ b/src/librdf.h.in
@@ -74,7 +74,7 @@ extern "C" {
 /* Use gcc 3.1+ feature to allow marking of deprecated API calls.
  * This gives a warning during compiling.
  */
-#if ( __GNUC__ == 3 && __GNUC_MINOR__ > 0 ) || __GNUC__ > 3
+#if (defined __GNUC__ && (( __GNUC__ == 3 && __GNUC_MINOR__ > 0 ) || __GNUC__ > 3)) || defined __clang__
 #define REDLAND_DEPRECATED __attribute__((deprecated))
 #define REDLAND_NORETURN __attribute__((__noreturn__))
 #else
@@ -83,7 +83,7 @@ extern "C" {
 #endif
 
 
-#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4)
+#if (defined __GNUC__ && (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4))) || defined __clang__
 #define REDLAND_PRINTF_FORMAT(string_index, first_to_check_index) \
   __attribute__((__format__(__printf__, string_index, first_to_check_index)))
 #else

From 781cd9b1c718b2c944dec63754f3703995dd163f Mon Sep 17 00:00:00 2001
From: David Ostrovsky <david@ostrovsky.org>
Date: Mon, 29 Aug 2016 17:35:10 +0200
Subject: [PATCH 2/2] Visual Studio 2015 has snprintf

---
 src/win32_rdf_config.h.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/win32_rdf_config.h.in b/src/win32_rdf_config.h.in
index 7ed474dd..7b2c3294 100644
--- a/src/win32_rdf_config.h.in
+++ b/src/win32_rdf_config.h.in
@@ -45,7 +45,9 @@ extern "C" {
 /* MS names for these functions */
 // next line breaks build on wntmsci12
 //#define vsnprintf _vsnprintf
+#if _MSC_VER < 1900 // older than VC 2015
 #define snprintf _snprintf
+#endif
 #define access _access
 #define stricmp _stricmp
 #define strnicmp _strnicmp