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
|
--- a/xpath.c Fri May 10 17:26:39 2013 +0800
+++ b/xpath.c Fri May 10 18:22:18 2013 +0800
@@ -951,7 +951,7 @@
static void
xpath_vfunc_string(sqlite3_context *ctx, int argc, sqlite3_value **argv)
{
- return xpath_vfunc_common(ctx, 0, argc, argv);
+ xpath_vfunc_common(ctx, 0, argc, argv);
}
/**
@@ -964,7 +964,7 @@
static void
xpath_vfunc_boolean(sqlite3_context *ctx, int argc, sqlite3_value **argv)
{
- return xpath_vfunc_common(ctx, 1, argc, argv);
+ xpath_vfunc_common(ctx, 1, argc, argv);
}
/**
@@ -977,7 +977,7 @@
static void
xpath_vfunc_number(sqlite3_context *ctx, int argc, sqlite3_value **argv)
{
- return xpath_vfunc_common(ctx, 2, argc, argv);
+ xpath_vfunc_common(ctx, 2, argc, argv);
}
/**
@@ -990,7 +990,7 @@
static void
xpath_vfunc_xml(sqlite3_context *ctx, int argc, sqlite3_value **argv)
{
- return xpath_vfunc_common(ctx, 3, argc, argv);
+ xpath_vfunc_common(ctx, 3, argc, argv);
}
/**
--- a/zipfile.c Fri May 10 17:26:39 2013 +0800
+++ b/zipfile.c Fri May 10 18:22:18 2013 +0800
@@ -226,7 +226,10 @@
goto error;
}
data = (unsigned char *) mmap(0, length, PROT_READ,
- MAP_FILE | MAP_PRIVATE, fd, 0);
+#ifdef MAP_FILE
+ MAP_FILE |
+#endif
+ MAP_PRIVATE, fd, 0);
if (data == MAP_FAILED) {
goto error;
}
@@ -1303,7 +1306,12 @@
#else
size = sizeof (mem_blk) + psize + length + 1;
mb = (mem_blk *) mmap(0, size, PROT_READ | PROT_WRITE,
- MAP_ANONYMOUS | MAP_PRIVATE, -1, 0);
+#if defined(MAP_ANONYMOUS)
+ MAP_ANONYMOUS |
+#elif defined(MAP_ANON)
+ MAP_ANON |
+#endif
+ MAP_PRIVATE, -1, 0);
if (mb == MAP_FAILED) {
return 0;
}
|
