File raptor-1.4.20-mingw.patch of Package mingw64-raptor

Overview Repositories Revisions Requests Users Attributes Meta

File raptor-1.4.20-mingw.patch of Package mingw64-raptor (Revision a8c2f571ada2c554b92993d37b2a4ce8)

Currently displaying revision a8c2f571ada2c554b92993d37b2a4ce8 , Show latest

--- raptor-1.4.20/librdfa/curie.c	2009-11-28 23:01:23.000000000 +0100
+++ raptor-1.4.20/librdfa/curie.c	2009-12-18 10:07:05.000000000 +0100
@@ -28,6 +28,10 @@
 #include "rdfa_utils.h"
 #include "rdfa.h"
 
+#ifdef _WIN32
+#define strtok_r(s,sep,lasts) (*(lasts)=strtok((s),(sep)))
+#endif
+
 // These are all of the @rel/@rev reserved words in XHTML 1.1 that
 // should generate triples.
 #define XHTML_RELREV_RESERVED_WORDS_SIZE 23
@@ -165,7 +169,7 @@
       {
          // if we have a relative URI, chop off the name of the file
          // and replace it with the relative pathname
-         char* end_index = rindex(context->base, '/');
+         char* end_index = strrchr(context->base, '/');
 
          if(end_index != NULL)
          {
@@ -173,7 +177,7 @@
             char* end_index2;
 
             tmpstr = rdfa_replace_string(tmpstr, context->base);
-            end_index2= rindex(tmpstr, '/');
+            end_index2= strrchr(tmpstr, '/');
             end_index2++;
             *end_index2 = '\0';
 
--- raptor-1.4.20/librdfa/iri.c	2009-11-23 22:13:58.000000000 +0100
+++ raptor-1.4.20/librdfa/iri.c	2009-12-18 10:07:43.000000000 +0100
@@ -39,12 +39,12 @@
    char* eindex = 0;
 
    // search to see if there is iquery separator
-   eindex = index(iri, '?');
+   eindex = strchr(iri, '?');
    if(eindex == NULL)
    {
       // if there is no iquery separator, check to see if there is an
       // ifragment separator
-      eindex = index(iri, '#');
+      eindex = strchr(iri, '#');
    }
 
    // check to see if the output string needs to be different from the
--- raptor-1.4.20/librdfa/rdfa.c	2009-11-29 00:38:50.000000000 +0100
+++ raptor-1.4.20/librdfa/rdfa.c	2009-12-18 10:02:03.000000000 +0100
@@ -165,7 +165,7 @@
       {
          char* href_start = strstr(base_start, "href=");
          char* uri_start = href_start + 6;
-         char* uri_end = index(uri_start, '"');
+         char* uri_end = strchr(uri_start, '"');
 
          if((uri_start != NULL) && (uri_end != NULL))
          {
@@ -902,8 +902,8 @@
       if(context->xml_literal != NULL)
       {
          // get the data between the first tag and the last tag
-         content_start = index(context->xml_literal, '>');
-         content_end = rindex(context->xml_literal, '<');
+         content_start = strchr(context->xml_literal, '>');
+         content_end = strrchr(context->xml_literal, '<');
          
          if((content_start != NULL) && (content_end != NULL))
          {
--- raptor-1.4.20/librdfa/rdfa_utils.c	2009-07-24 00:07:28.000000000 +0200
+++ raptor-1.4.20/librdfa/rdfa_utils.c	2009-12-18 09:59:04.000000000 +0100
@@ -28,6 +28,10 @@
 
 #define RDFA_WHITESPACE_CHARACTERS " \a\b\t\n\v\f\r"
 
+#ifdef _WIN32
+#define strtok_r(s,sep,lasts) (*(lasts)=strtok((s),(sep)))
+#endif
+
 char* rdfa_join_string(const char* prefix, const char* suffix)
 {
    char* rval = NULL;
--- raptor-1.4.20/librdfa/triple.c	2009-11-28 23:01:23.000000000 +0100
+++ raptor-1.4.20/librdfa/triple.c	2009-12-18 10:09:43.000000000 +0100
@@ -437,7 +437,7 @@
       current_object_literal = context->content;
       type = RDF_TYPE_PLAIN_LITERAL;
    }
-   else if(index(context->xml_literal, '<') == NULL)
+   else if(strchr(context->xml_literal, '<') == NULL)
    {      
       current_object_literal = context->plain_literal;
       type = RDF_TYPE_PLAIN_LITERAL;
@@ -467,7 +467,7 @@
    // [current element], i.e., not including the element itself, and
    // giving it a datatype of rdf:XMLLiteral.
    if((current_object_literal == NULL) &&
-      (index(context->xml_literal, '<') != NULL) &&
+      (strchr(context->xml_literal, '<') != NULL) &&
       ((context->datatype == NULL) ||
        (strcmp(context->datatype,
                "http://www.w3.org/1999/02/22-rdf-syntax-ns#XMLLiteral") == 0)))
--- raptor-1.4.20/src/Makefile.am	2009-11-23 22:13:58.000000000 +0100
+++ raptor-1.4.20/src/Makefile.am	2009-12-18 09:59:04.000000000 +0100
@@ -164,7 +164,7 @@
 AM_CPPFLAGS += -DLIBRDFA_IN_RAPTOR -I$(top_srcdir)/librdfa
 endif
 
-libraptor_la_LDFLAGS = -version-info @RAPTOR_LIBTOOL_VERSION@ \
+libraptor_la_LDFLAGS = -no-undefined -version-info @RAPTOR_LIBTOOL_VERSION@ \
 @RAPTOR_LDFLAGS@ $(MEM_LIBS)
 libraptor_la_LIBADD = @LTLIBOBJS@
 
--- raptor-1.4.20/src/win32_raptor_config.h	2009-11-25 07:04:16.000000000 +0100
+++ raptor-1.4.20/src/win32_raptor_config.h	2009-12-18 09:59:04.000000000 +0100
@@ -33,6 +33,8 @@
 
 #define WIN32_LEAN_AND_MEAN 1
 
+#ifndef HAVE_CONFIG_H
+
 /* getopt is not in standard win32 C library - define if we have it */
 /* #define HAVE_GETOPT_H 1 */
 
@@ -68,6 +70,8 @@
 
 #define HAVE_STRICMP 1
 
+#endif /* HAVE_CONFIG_H */
+
 /* MS names for these functions */
 #define vsnprintf _vsnprintf
 #define snprintf _snprintf
@@ -85,6 +89,8 @@
 /* __func__ doesn't exist in Visual Studio 6 */
 #define __func__ ""
 
+#ifndef HAVE_CONFIG_H
+
 /* 
  * Defines that come from config.h
  */
@@ -127,6 +133,7 @@
 
 #define RAPTOR_WWW_LIBCURL 1
 
+#endif /* HAVE_CONFIG_H */
 
 #include <windows.h>
 
@@ -144,6 +151,8 @@
 #undef RAPTOR_INLINE
 #define RAPTOR_INLINE __inline
 
+#ifndef HAVE_CONFIG_H
+
 /* The size of a `unsigned char', as computed by sizeof. */
 #define SIZEOF_UNSIGNED_CHAR 1
 
@@ -159,6 +168,8 @@
 /* The size of a `unsigned long long', as computed by sizeof. */
 #define SIZEOF_UNSIGNED_LONG_LONG 8
 
+#endif /* HAVE_CONFIG_H */
+
 
 #ifdef __cplusplus
 }

Places

File raptor-1.4.20-mingw.patch of Package mingw64-raptor (Revision a8c2f571ada2c554b92993d37b2a4ce8)

Places