From ebcde8e4e17584665414bd89ebf6d81a43ac823b Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Mon, 31 Aug 2015 23:53:21 +0200 Subject: Fix redland on MSVC 14.0 Change-Id: I1b51102bd4d5aa6b148c0cd7e191d01c72b6c1c9 Reviewed-on: https://gerrit.libreoffice.org/18214 Reviewed-by: Michael Stahl Tested-by: Michael Stahl --- external/redland/rasqal/rasqal-msvc.patch.1 | 94 ++++++++++++++------------- external/redland/redland/redland-msvc.patch.1 | 36 ++++------ 2 files changed, 64 insertions(+), 66 deletions(-) (limited to 'external/redland') diff --git a/external/redland/rasqal/rasqal-msvc.patch.1 b/external/redland/rasqal/rasqal-msvc.patch.1 index f6d312d4ba60..95b4ce8f80f7 100644 --- a/external/redland/rasqal/rasqal-msvc.patch.1 +++ b/external/redland/rasqal/rasqal-msvc.patch.1 @@ -1,6 +1,46 @@ ---- a/src/win32_rasqal_config.h Fri Jun 27 04:02:09 2008 -+++ b/src/win32_rasqal_config.h Thu Nov 6 12:07:06 2008 -@@ -31,6 +31,7 @@ +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 @@ -8,7 +48,6 @@ /* getopt is not in standard win32 C library - define if we have it */ /* #define HAVE_GETOPT_H 1 */ -@@ -37,10 +37,13 @@ #define HAVE_STDLIB_H 1 @@ -20,10 +59,13 @@ -#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 -@@ -101,7 +102,6 @@ + #define strnicmp _strnicmp +@@ -101,7 +107,6 @@ * Defines that come from config.h */ @@ -31,13 +73,13 @@ #include #include -@@ -116,8 +122,16 @@ +@@ -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 @@ -45,43 +87,7 @@ +#define RASQAL_DECIMAL_NONE 1 +#define RASQAL_UUID_INTERNAL 1 +#define RASQAL_DIGEST_INTERNAL 1 -+ + #ifdef _DEBUG #define RASQAL_DEBUG 1 - #endif ---- a/src/rasqal_digest_md5.c 2013-04-01 00:18:47.913835564 +0200 -+++ b/src/rasqal_digest_md5.c 2013-04-01 00:18:52.657835523 +0200 -@@ -50,7 +50,6 @@ - - #include - #include --#include - #include - - #include "rasqal.h" ---- a/src/rasqal_digest_sha1.c 2013-04-01 00:19:04.655835420 +0200 -+++ b/src/rasqal_digest_sha1.c 2013-04-01 00:19:10.448835370 +0200 -@@ -93,7 +93,6 @@ - #include - #include - #include --#include - - #include "rasqal.h" - #include "rasqal_internal.h" ---- a/src/rasqal_internal.h 2013-04-01 00:18:11.090835880 +0200 -+++ b/src/rasqal_internal.h 2013-04-01 00:18:13.610835859 +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 --git a/external/redland/redland/redland-msvc.patch.1 b/external/redland/redland/redland-msvc.patch.1 index 50585017e431..4044fd064be8 100644 --- a/external/redland/redland/redland-msvc.patch.1 +++ b/external/redland/redland/redland-msvc.patch.1 @@ -1,16 +1,19 @@ ---- a/src/win32_rdf_config.h Tue Jul 1 05:10:26 2008 -+++ b/src/win32_rdf_config.h Wed Feb 18 13:31:07 2009 -@@ -43,7 +43,8 @@ +--- redland.orig/src/win32_rdf_config.h 2015-09-02 23:12:12.894126138 +0200 ++++ redland/src/win32_rdf_config.h 2015-09-02 23:23:54.600173246 +0200 +@@ -43,8 +43,11 @@ #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 -@@ -72,40 +73,40 @@ + #define strnicmp _strnicmp +@@ -75,40 +78,40 @@ */ /* BDB has close method with 2 args */ @@ -61,7 +64,7 @@ /* Define to 1 if you have the header file. */ /* undef HAVE_DLFCN_H */ -@@ -141,13 +142,13 @@ +@@ -141,13 +144,13 @@ /* #undef HAVE_LIBWWW */ /* Have local MD5 digest */ @@ -77,7 +80,7 @@ /* Define to 1 if you have the header file. */ #define HAVE_MEMORY_H 1 -@@ -159,25 +160,28 @@ +@@ -159,7 +162,7 @@ #define HAVE_MKTEMP 1 /* MySQL libraries are present */ @@ -86,18 +89,7 @@ /* Define to 1 if you have the header file. */ /* #undef HAVE_OPENSSL_CRYPTO_H */ - - /* Have openssl MD5 digest */ - /* #undef HAVE_OPENSSL_CRYPTO_MD5_DIGEST */ - - /* Have openssl RIPEMD160 digest */ - /* #undef HAVE_OPENSSL_CRYPTO_RIPEMD160_DIGEST */ - - /* Have openssl SHA1 digest */ - /* #undef HAVE_OPENSSL_CRYPTO_SHA1_DIGEST */ - - /* Have openssl digests */ - /* #undef HAVE_OPENSSL_DIGESTS */ +@@ -178,6 +181,9 @@ /* Define to 1 if you have the header file. */ /* #undef HAVE_PTHREAD_H */ @@ -107,7 +99,7 @@ /* Define to 1 if you have the header file. */ #define HAVE_STDINT_H 1 -@@ -246,7 +255,7 @@ +@@ -246,7 +252,7 @@ #define SIZEOF_UNSIGNED_LONG_LONG 8 /* SQLite API version */ @@ -116,7 +108,7 @@ /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 -@@ -254,14 +263,17 @@ +@@ -254,6 +260,9 @@ /* Building file storage */ #define STORAGE_FILE 1 @@ -126,7 +118,7 @@ /* Building MySQL storage */ /* #define STORAGE_MYSQL 1 */ - /* Building PostgreSQL storage */ +@@ -261,7 +270,7 @@ /*#undef STORAGE_POSTGRESQL*/ /* Building SQLite storage */ @@ -135,7 +127,7 @@ /* Building 3store storage */ /*#undef STORAGE_TSTORE*/ -@@ -273,7 +273,7 @@ +@@ -273,7 +282,7 @@ #define VERSION "1.0.16" /* Use POSIX threads */ -- cgit