[Libreoffice-commits] core.git: external/redland

[Tomoyuki Kubota (via logerrit)]

 external/redland/Library_raptor.mk            |    2 +
 external/redland/Library_rasqal.mk            |    6 +++++
 external/redland/raptor/raptor-msvc.patch.1   |   13 +++++++++++
 external/redland/rasqal/rasqal-msvc.patch.1   |   15 +++++++++++++
 external/redland/redland/redland-msvc.patch.1 |   29 ++++++++++++++++++++++++++
 5 files changed, 65 insertions(+)

New commits:
commit a96167f88aa68651f055aa9096e63c9e48c8e4fa
Author:     Tomoyuki Kubota <himajin100000 at gmail.com>
AuthorDate: Tue Apr 16 22:23:32 2019 +0900
Commit:     Michael Stahl <Michael.Stahl at cib.de>
CommitDate: Wed Apr 17 11:00:32 2019 +0200

    avoid C4013 and C4117
    
    calloc,free,clock,time,ceil,frexp,fabs,ldex,access,getpid for C4013
    __FUNCTION__ for C4117
    
    Change-Id: I71e1894893f3aa9cf0e5ac699e44586144a14743
    Reviewed-on: https://gerrit.libreoffice.org/70423
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>

diff --git a/external/redland/Library_raptor.mk b/external/redland/Library_raptor.mk
index 1f171c1bc752..146a46e90cfe 100644
--- a/external/redland/Library_raptor.mk
+++ b/external/redland/Library_raptor.mk
@@ -32,6 +32,8 @@ $(eval $(call gb_Library_add_defs,raptor2,\
 	-D_USRDLL \
 	-DWIN32_EXPORTS \
 	-DYY_NO_UNISTD_H \
+	-DHAVE__ACCESS \
+	-UHAVE_ACCESS \
 ))
 
 $(eval $(call gb_Library_add_generated_cobjects,raptor2,\
diff --git a/external/redland/Library_rasqal.mk b/external/redland/Library_rasqal.mk
index a62a5491b721..46b37c2116a3 100644
--- a/external/redland/Library_rasqal.mk
+++ b/external/redland/Library_rasqal.mk
@@ -26,6 +26,12 @@ $(eval $(call gb_Library_add_defs,rasqal,\
 	-D_USRDLL \
 	-DWIN32_EXPORTS \
 	-D_MT \
+	-DHAVE_STDLIB_H \
+	-DHAVE_STDINT_H \
+	-DHAVE_TIME_H \
+	-DHAVE_MATH_H \
+	-DHAVE_FLOAT_H \
+	-DHAVE___FUNCTION__ \
 ))
 
 $(eval $(call gb_Library_set_include,rasqal,\
diff --git a/external/redland/raptor/raptor-msvc.patch.1 b/external/redland/raptor/raptor-msvc.patch.1
index e62f4d005fec..245b19bdca70 100644
--- a/external/redland/raptor/raptor-msvc.patch.1
+++ b/external/redland/raptor/raptor-msvc.patch.1
@@ -8,3 +8,16 @@
  void raptor_sort_r(void *base, size_t nel, size_t width, raptor_data_compare_arg_handler compar, void *user_data);
  
  
+--- raptor/src/raptor_uri.c	2016-08-26 23:45:34.543400074 +0200
++++ raptor/src/raptor_uri.c	2016-08-26 23:45:40.479399614 +0200
+@@ -51,6 +51,10 @@
+ #include <sys/stat.h>
+ #endif
+ 
++#if !defined(HAVE_ACCESS) && defined(HAVE__ACCESS)
++#include <io.h>
++#endif
++
+ /* Raptor includes */
+ #include "raptor2.h"
+ #include "raptor_internal.h"
diff --git a/external/redland/rasqal/rasqal-msvc.patch.1 b/external/redland/rasqal/rasqal-msvc.patch.1
index fbdaf32b25a7..f32f6720b8e1 100644
--- a/external/redland/rasqal/rasqal-msvc.patch.1
+++ b/external/redland/rasqal/rasqal-msvc.patch.1
@@ -9,6 +9,21 @@ diff -ru rasqal.orig/src/win32_rasqal_config.h rasqal/src/win32_rasqal_config.h
  #define access _access
  #define stricmp _stricmp
  #define strnicmp _strnicmp
+@@ -42,10 +43,10 @@
+ int rasqal_gettimeofday(struct timeval *tv, struct timezone *tz);
+ #undef HAVE_GETTIMEOFDAY
+ 
+-#include <float.h>
+-#define isnan(n) _isnan(n)
+-/* no round function available */
+-#define round(x) floor(x+0.5)
++// #include <float.h>
++// #define isnan(n) _isnan(n)
++// /* no round function available */
++// #define round(x) floor(x+0.5)
+ 
+ /* These are SPARQL token definitions */
+ #ifdef OPTIONAL
 --- rasqal/src/rasqal_ntriples.c.orig	2016-08-26 23:29:58.343472683 +0200
 +++ rasqal/src/rasqal_ntriples.c	2016-08-26 23:30:10.553471736 +0200
 @@ -25,6 +25,10 @@
diff --git a/external/redland/redland/redland-msvc.patch.1 b/external/redland/redland/redland-msvc.patch.1
index 1b170989fd1e..1cdc6cf48775 100644
--- a/external/redland/redland/redland-msvc.patch.1
+++ b/external/redland/redland/redland-msvc.patch.1
@@ -93,3 +93,32 @@
  
  /* Building 3store storage */
  /*#undef STORAGE_TSTORE*/
+@@ -288,11 +288,11 @@
+ #include <io.h>
+ #include <memory.h>
+ 
+-/* get _isnan() since it is not in math.h */
+-#include <float.h>
+-#ifndef isnan
+-#define isnan(d) (_isnan(d))
+-#endif
++// /* get _isnan() since it is not in math.h */
++// #include <float.h>
++// #ifndef isnan
++// #define isnan(d) (_isnan(d))
++// #endif
+ 
+ #ifdef __cplusplus
+ }
+--- redland.orig/src/rdf_init.c	2015-09-02 23:12:12.894126138 +0200
++++ redland/src/rdf_init.c	2015-09-02 23:23:54.600173246 +0200
+@@ -42,6 +42,8 @@
+ #endif
+ #ifdef HAVE_UNISTD_H
+ #include <unistd.h> /* for getpid() */
++#else
++#include <process.h>
+ #endif
+ 
+ /* for gettimeofday */
+ 
\ No newline at end of file