diff -ru rasqal.orig/src/rasqal_digest_md5.c rasqal/src/rasqal_digest_md5.c --- rasqal.orig/src/rasqal_digest_md5.c 2012-02-11 00:41:11.000000000 +0100 +++ rasqal/src/rasqal_digest_md5.c 2015-09-02 23:26:38.094184222 +0200 @@ -50,7 +50,6 @@ #include #include -#include #include #include "rasqal.h" diff -ru rasqal.orig/src/rasqal_digest_sha1.c rasqal/src/rasqal_digest_sha1.c --- rasqal.orig/src/rasqal_digest_sha1.c 2012-02-16 06:54:24.000000000 +0100 +++ rasqal/src/rasqal_digest_sha1.c 2015-09-02 23:26:44.922184681 +0200 @@ -93,7 +93,6 @@ #include #include #include -#include #include "rasqal.h" #include "rasqal_internal.h" diff -ru rasqal.orig/src/rasqal_internal.h rasqal/src/rasqal_internal.h --- rasqal.orig/src/rasqal_internal.h 2012-07-30 00:21:11.000000000 +0200 +++ rasqal/src/rasqal_internal.h 2015-09-02 23:26:50.240185038 +0200 @@ -26,6 +26,13 @@ #ifndef RASQAL_INTERNAL_H #define RASQAL_INTERNAL_H +#if defined(_MSC_VER) && _MSC_VER < 1600 +typedef unsigned __int32 uint32_t; +typedef __int16 int16_t; +#else +#include +#endif + #ifdef __cplusplus extern "C" { #define RASQAL_EXTERN_C extern "C" diff -ru rasqal.orig/src/win32_rasqal_config.h rasqal/src/win32_rasqal_config.h --- rasqal.orig/src/win32_rasqal_config.h 2015-09-02 23:12:00.733125322 +0200 +++ rasqal/src/win32_rasqal_config.h 2015-09-02 23:28:10.152190403 +0200 @@ -31,17 +31,23 @@ #endif #define WIN32_LEAN_AND_MEAN 1 +#include /* getopt is not in standard win32 C library - define if we have it */ /* #define HAVE_GETOPT_H 1 */ #define HAVE_STDLIB_H 1 +#define HAVE_ERRNO_H 1 + #define HAVE_STRICMP 1 /* MS names for these functions */ -#define vsnprintf _vsnprintf +// 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 @@ -101,7 +107,6 @@ * Defines that come from config.h */ -#include #include #include @@ -149,7 +154,15 @@ /* #define RAPTOR_TRIPLES_SOURCE_REDLAND 1 */ /* Use PCRE regex library */ -#define RASQAL_REGEX_PCRE 1 +//#define RASQAL_REGEX_PCRE 1 + +#define HAVE_LIBXML_SCHEMASINTERNALS_H 1 +#define HAVE_LIBXML_XMLSCHEMASTYPES_H 1 +#define HAVE_LIBXML_XMLSCHEMAS_H 1 + +#define RASQAL_DECIMAL_NONE 1 +#define RASQAL_UUID_INTERNAL 1 +#define RASQAL_DIGEST_INTERNAL 1 #ifdef _DEBUG #define RASQAL_DEBUG 1 #define RASQAL_EXTERN_C extern "C"