1diff -ru rasqal.orig/src/win32_rasqal_config.h rasqal/src/win32_rasqal_config.h
2--- rasqal.orig/src/win32_rasqal_config.h	2015-09-02 23:12:00.733125322 +0200
3+++ rasqal/src/win32_rasqal_config.h	2015-09-02 23:28:10.152190403 +0200
4@@ -31,7 +31,6 @@
5 /* MS names for these functions */
6 // next line breaks build on wntmsci12
7 //#define vsnprintf _vsnprintf
8-#define snprintf _snprintf
9 #define access _access
10 #define stricmp _stricmp
11 #define strnicmp _strnicmp
12@@ -42,10 +43,10 @@
13 int rasqal_gettimeofday(struct timeval *tv, struct timezone *tz);
14 #undef HAVE_GETTIMEOFDAY
15
16-#include <float.h>
17-#define isnan(n) _isnan(n)
18-/* no round function available */
19-#define round(x) floor(x+0.5)
20+// #include <float.h>
21+// #define isnan(n) _isnan(n)
22+// /* no round function available */
23+// #define round(x) floor(x+0.5)
24
25 /* These are SPARQL token definitions */
26 #ifdef OPTIONAL
27--- rasqal/src/rasqal_ntriples.c.orig	2016-08-26 23:29:58.343472683 +0200
28+++ rasqal/src/rasqal_ntriples.c	2016-08-26 23:30:10.553471736 +0200
29@@ -25,6 +25,10 @@
30 #include <rasqal_config.h>
31 #endif
32
33+#ifdef _WIN32
34+#include <win32_rasqal_config.h>
35+#endif
36+
37 #include <stdio.h>
38 #include <string.h>
39 #include <ctype.h>
40--- rasqal/src/sv_config.h.orig	2016-08-26 23:29:42.408473919 +0200
41+++ rasqal/src/sv_config.h	2016-08-26 23:29:44.760473737 +0200
42@@ -29,7 +29,11 @@
43 extern "C" {
44 #endif
45
46+#ifdef _WIN32
47+#include <win32_rasqal_config.h>
48+#else
49 #include <rasqal_config.h>
50+#endif
51
52 #define sv_new rasqal_sv_new
53 #define sv_free rasqal_sv_free
54--- rasqal/src/rasqal.h.in.orig	2016-08-26 23:42:23.198414915 +0200
55+++ rasqal/src/rasqal.h.in	2016-08-26 23:42:34.627414028 +0200
56@@ -1473,7 +1473,7 @@
57
58 RASQAL_API
59 int rasqal_query_results_formats_check2(rasqal_world* world, const char *name, raptor_uri* uri, const char *mime_type, int flags);
60-RASQAL_API RASQAL_API RASQAL_DEPRECATED
61+RASQAL_API RASQAL_DEPRECATED
62 int rasqal_query_results_formats_check(rasqal_world* world, const char *name, raptor_uri* uri, const char *mime_type, int flags);
63 RASQAL_API
64 rasqal_query_results_formatter* rasqal_new_query_results_formatter(rasqal_world* world, const char *name, const char *mime_type, raptor_uri* format_uri);
65