diff options
| author | Lorry Tar Creator <lorry-tar-importer@baserock.org> | 2015-02-17 17:25:57 +0000 |
|---|---|---|
| committer | <> | 2015-03-17 16:26:24 +0000 |
| commit | 780b92ada9afcf1d58085a83a0b9e6bc982203d1 (patch) | |
| tree | 598f8b9fa431b228d29897e798de4ac0c1d3d970 /dist/odbc | |
| parent | 7a2660ba9cc2dc03a69ddfcfd95369395cc87444 (diff) | |
| download | berkeleydb-master.tar.gz | |
Diffstat (limited to 'dist/odbc')
| -rw-r--r-- | dist/odbc/odbc.patch | 66 | ||||
| -rw-r--r-- | dist/odbc/sqlite3odbc.patch | 19 |
2 files changed, 85 insertions, 0 deletions
diff --git a/dist/odbc/odbc.patch b/dist/odbc/odbc.patch new file mode 100644 index 00000000..48cc837a --- /dev/null +++ b/dist/odbc/odbc.patch @@ -0,0 +1,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; + } diff --git a/dist/odbc/sqlite3odbc.patch b/dist/odbc/sqlite3odbc.patch new file mode 100644 index 00000000..65c223c6 --- /dev/null +++ b/dist/odbc/sqlite3odbc.patch @@ -0,0 +1,19 @@ +--- a/sqlite3odbc.c Sun Dec 8 15:19:27 2013 ++++ b/sqlite3odbc.c Fri Mar 28 11:59:54 2014 +@@ -401,6 +401,7 @@ + #define snprintf _snprintf + #define strcasecmp _stricmp + #define strncasecmp _strnicmp ++#define strtoll _strtoi64 + + static HINSTANCE NEAR hModule; /* Saved module handle for resources */ + +@@ -13916,7 +13916,7 @@ + dlen -= 2; + dp += 2; + dlen = dlen / 2; +- s->bincache = bin = xmalloc(dlen); ++ s->bincache = bin = xmalloc(dlen + 1); + if (!bin) { + return nomem(s); + } |