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

Overview Repositories Revisions Requests Users Attributes Meta

File raptor-1.4.21-mingw.patch of Package mingw64-raptor (Revision a3b1d4e87418171ecd982b11be87988c)

Currently displaying revision a3b1d4e87418171ecd982b11be87988c , Show latest

--- raptor-1.4.21/librdfa/curie.c	2010-01-30 00:54:42.000000000 +0100
+++ raptor-1.4.21/librdfa/curie.c	2010-11-25 23:54:02.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 24
--- raptor-1.4.21/librdfa/rdfa_utils.c	2009-07-27 20:29:07.000000000 +0200
+++ raptor-1.4.21/librdfa/rdfa_utils.c	2010-11-25 23:54:07.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.21/src/Makefile.am	2010-01-30 00:54:42.000000000 +0100
+++ raptor-1.4.21/src/Makefile.am	2010-11-25 23:54:08.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.21/src/win32_raptor_config.h	2010-01-30 00:54:42.000000000 +0100
+++ raptor-1.4.21/src/win32_raptor_config.h	2010-11-25 23:54:08.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.21-mingw.patch of Package mingw64-raptor (Revision a3b1d4e87418171ecd982b11be87988c)

Places