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

Overview Repositories Revisions Requests Users Attributes Meta

File raptor-1.4.19-mingw.patch of Package mingw64-raptor (Revision 3180eb70088dc74c21069366882393ed)

Currently displaying revision 3180eb70088dc74c21069366882393ed , Show latest

--- raptor-1.4.19/configure.ac	2008-06-15 10:25:20.000000000 +0200
+++ raptor-1.4.19/configure.ac	2009-06-30 21:06:37.000000000 +0200
@@ -295,7 +295,8 @@
   return is_c99("1234567");
 }], AC_MSG_RESULT(no),
     AC_DEFINE(HAVE_C99_VSNPRINTF, 1, [vsnprint has C99 compatible return value])
-    AC_MSG_RESULT(yes))
+    AC_MSG_RESULT(yes),
+	AC_MSG_RESULT(unknown))
 fi
 
 need_libm=no
--- raptor-1.4.19/librdfa/curie.c	2008-06-14 07:33:37.000000000 +0200
+++ raptor-1.4.19/librdfa/curie.c	2009-06-30 21:06:37.000000000 +0200
@@ -28,6 +28,12 @@
 #include "rdfa_utils.h"
 #include "rdfa.h"
 
+#ifdef _WIN32
+#define strtok_r(s,sep,lasts) (*(lasts)=strtok((s),(sep)))
+#define index strchr
+#define rindex strrchr
+#endif
+
 // These are all of the @property reserved words in XHTML 1.1 that
 // should generate triples.
 #define XHTML_PROPERTY_RESERVED_WORDS_SIZE 6
--- raptor-1.4.19/librdfa/rdfa.c	2008-06-16 04:02:58.000000000 +0200
+++ raptor-1.4.19/librdfa/rdfa.c	2009-06-30 21:06:37.000000000 +0200
@@ -41,6 +41,11 @@
 #include "rdfa_utils.h"
 #include "rdfa.h"
 
+#ifdef _WIN32
+#define index strchr
+#define rindex strrchr
+#endif
+
 #define READ_BUFFER_SIZE 4096
 
 void rdfa_init_context(rdfacontext* context)
--- raptor-1.4.19/librdfa/rdfa_utils.c	2008-06-14 07:33:37.000000000 +0200
+++ raptor-1.4.19/librdfa/rdfa_utils.c	2009-06-30 21:06:37.000000000 +0200
@@ -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.19/librdfa/triple.c	2008-06-14 07:33:37.000000000 +0200
+++ raptor-1.4.19/librdfa/triple.c	2009-06-30 21:06:37.000000000 +0200
@@ -28,6 +28,11 @@
 #include "rdfa_utils.h"
 #include "rdfa.h"
 
+#ifdef _WIN32
+#define index strchr
+#define rindex strrchr
+#endif
+
 rdftriple* rdfa_create_triple(const char* subject, const char* predicate,
    const char* object, rdfresource_t object_type, const char* datatype,
    const char* language)
--- raptor-1.4.19/src/win32_raptor_config.h	2008-04-02 06:50:14.000000000 +0200
+++ raptor-1.4.19/src/win32_raptor_config.h	2009-06-30 21:13:11.000000000 +0200
@@ -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
 }
--- raptor-1.4.19/src/Makefile.am	2009-11-11 11:57:03.000000000 +0100
+++ raptor-1.4.19/src/Makefile.am	2009-11-11 11:57:49.000000000 +0100
@@ -163,7 +163,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@

Places

File raptor-1.4.19-mingw.patch of Package mingw64-raptor (Revision 3180eb70088dc74c21069366882393ed)

Places