Fossil SCM
When compiled on Cygwin using --disable-internal-sqlite, this special Cygwin handling is no longer necessary (SQLite 3.8.4.1 Cygwin build already handles that).
Commit
625297ab91063d85287de4693fa11b17ff3f3087
Parent
5cdc39dc2d532b4…
2 files changed
+1
-1
+1
-1
M
src/db.c
+1
-1
| --- src/db.c | ||
| +++ src/db.c | ||
| @@ -715,11 +715,11 @@ | ||
| 715 | 715 | */ |
| 716 | 716 | LOCAL sqlite3 *db_open(const char *zDbName){ |
| 717 | 717 | int rc; |
| 718 | 718 | sqlite3 *db; |
| 719 | 719 | |
| 720 | -#if defined(__CYGWIN__) && !defined(USE_SYSTEM_SQLITE) | |
| 720 | +#if defined(__CYGWIN__) && USE_SYSTEM_SQLITE+0!=1 | |
| 721 | 721 | zDbName = fossil_utf8_to_filename(zDbName); |
| 722 | 722 | #endif |
| 723 | 723 | if( g.fSqlTrace ) fossil_trace("-- sqlite3_open: [%s]\n", zDbName); |
| 724 | 724 | rc = sqlite3_open_v2( |
| 725 | 725 | zDbName, &db, |
| 726 | 726 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -715,11 +715,11 @@ | |
| 715 | */ |
| 716 | LOCAL sqlite3 *db_open(const char *zDbName){ |
| 717 | int rc; |
| 718 | sqlite3 *db; |
| 719 | |
| 720 | #if defined(__CYGWIN__) && !defined(USE_SYSTEM_SQLITE) |
| 721 | zDbName = fossil_utf8_to_filename(zDbName); |
| 722 | #endif |
| 723 | if( g.fSqlTrace ) fossil_trace("-- sqlite3_open: [%s]\n", zDbName); |
| 724 | rc = sqlite3_open_v2( |
| 725 | zDbName, &db, |
| 726 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -715,11 +715,11 @@ | |
| 715 | */ |
| 716 | LOCAL sqlite3 *db_open(const char *zDbName){ |
| 717 | int rc; |
| 718 | sqlite3 *db; |
| 719 | |
| 720 | #if defined(__CYGWIN__) && USE_SYSTEM_SQLITE+0!=1 |
| 721 | zDbName = fossil_utf8_to_filename(zDbName); |
| 722 | #endif |
| 723 | if( g.fSqlTrace ) fossil_trace("-- sqlite3_open: [%s]\n", zDbName); |
| 724 | rc = sqlite3_open_v2( |
| 725 | zDbName, &db, |
| 726 |
+1
-1
| --- src/main.c | ||
| +++ src/main.c | ||
| @@ -604,11 +604,11 @@ | ||
| 604 | 604 | #endif |
| 605 | 605 | g.mainTimerId = fossil_timer_start(); |
| 606 | 606 | g.zVfsName = find_option("vfs",0,1); |
| 607 | 607 | if( g.zVfsName==0 ){ |
| 608 | 608 | g.zVfsName = fossil_getenv("FOSSIL_VFS"); |
| 609 | -#if defined(__CYGWIN__) | |
| 609 | +#if defined(__CYGWIN__) && USE_SYSTEM_SQLITE+0!=1 | |
| 610 | 610 | if( g.zVfsName==0 ){ |
| 611 | 611 | g.zVfsName = "win32-longpath"; |
| 612 | 612 | } |
| 613 | 613 | #endif |
| 614 | 614 | } |
| 615 | 615 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -604,11 +604,11 @@ | |
| 604 | #endif |
| 605 | g.mainTimerId = fossil_timer_start(); |
| 606 | g.zVfsName = find_option("vfs",0,1); |
| 607 | if( g.zVfsName==0 ){ |
| 608 | g.zVfsName = fossil_getenv("FOSSIL_VFS"); |
| 609 | #if defined(__CYGWIN__) |
| 610 | if( g.zVfsName==0 ){ |
| 611 | g.zVfsName = "win32-longpath"; |
| 612 | } |
| 613 | #endif |
| 614 | } |
| 615 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -604,11 +604,11 @@ | |
| 604 | #endif |
| 605 | g.mainTimerId = fossil_timer_start(); |
| 606 | g.zVfsName = find_option("vfs",0,1); |
| 607 | if( g.zVfsName==0 ){ |
| 608 | g.zVfsName = fossil_getenv("FOSSIL_VFS"); |
| 609 | #if defined(__CYGWIN__) && USE_SYSTEM_SQLITE+0!=1 |
| 610 | if( g.zVfsName==0 ){ |
| 611 | g.zVfsName = "win32-longpath"; |
| 612 | } |
| 613 | #endif |
| 614 | } |
| 615 |