1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
|
--- 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,7 +43,6 @@
/* MS names for these functions */
// next line breaks build on wntmsci12
//#define vsnprintf _vsnprintf
-#define snprintf _snprintf
#define access _access
#define stricmp _stricmp
#define strnicmp _strnicmp
@@ -75,40 +78,40 @@
*/
/* BDB has close method with 2 args */
-#define HAVE_BDB_CLOSE_2_ARGS 1
+// #define HAVE_BDB_CLOSE_2_ARGS 1
/* BDB defines DBC */
-#define HAVE_BDB_CURSOR 1
+// #define HAVE_BDB_CURSOR 1
/* BDB cursor method has 4 arguments */
-#define HAVE_BDB_CURSOR_4_ARGS 1
+// #define HAVE_BDB_CURSOR_4_ARGS 1
/* BDB defines DB_TXN */
-#define HAVE_BDB_DB_TXN 1
+// #define HAVE_BDB_DB_TXN 1
/* BDB has fd method with 2 args */
-#define HAVE_BDB_FD_2_ARGS 1
+// #define HAVE_BDB_FD_2_ARGS 1
/* Have BDB hash support */
-#define HAVE_BDB_HASH 1
+// #define HAVE_BDB_HASH 1
/* BDB has open method with 6 args */
/* #undef HAVE_BDB_OPEN_6_ARGS */
/* BDB has open method with 7 args */
-#define HAVE_BDB_OPEN_7_ARGS 1
+// #define HAVE_BDB_OPEN_7_ARGS 1
/* BDB has set_flags method */
-#define HAVE_BDB_SET_FLAGS 1
+// #define HAVE_BDB_SET_FLAGS 1
/* BDB has dbopen method */
/* #undef HAVE_DBOPEN */
/* BDB has db_create method */
-#define HAVE_DB_CREATE 1
+// #define HAVE_DB_CREATE 1
/* Define to 1 if you have the <db.h> header file. */
-#define HAVE_DB_H 1
+// #define HAVE_DB_H 1
/* Define to 1 if you have the <dlfcn.h> header file. */
/* undef HAVE_DLFCN_H */
@@ -141,13 +144,13 @@
/* #undef HAVE_LIBWWW */
/* Have local MD5 digest */
-#define HAVE_LOCAL_MD5_DIGEST 1
+// #define HAVE_LOCAL_MD5_DIGEST 1
/* Have local RIPEMD160 digest */
/* #undef HAVE_LOCAL_RIPEMD160_DIGEST */
/* Have local SHA1 digest */
-#define HAVE_LOCAL_SHA1_DIGEST 1
+// #define HAVE_LOCAL_SHA1_DIGEST 1
/* Define to 1 if you have the <memory.h> header file. */
#define HAVE_MEMORY_H 1
@@ -159,7 +162,7 @@
#define HAVE_MKTEMP 1
/* MySQL libraries are present */
-#define HAVE_MYSQL 1
+// #define HAVE_MYSQL 1
/* Define to 1 if you have the <openssl/crypto.h> header file. */
/* #undef HAVE_OPENSSL_CRYPTO_H */
@@ -261,7 +267,7 @@
/*#undef STORAGE_POSTGRESQL*/
/* Building SQLite storage */
-#define STORAGE_SQLITE 1
+// #define STORAGE_SQLITE 1
/* 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 */
|
