Fossil SCM
On Cygwin, extend the "win32" max path length to 4096 in stead of reducing the "win32-longpath" max path length to 4096. (why didn't I think of that earlier....). One less "#if defined(__CYGWIN__)" in the code, because it eliminates the need for the "win32-longpath" VFS on Cygwin altogether.
Commit
4f4b15aba85436c092e84be4a573b85df92bab95
Parent
cd4301ce449c3c0…
2 files changed
+3
-1
-5
+3
-1
| --- Makefile.Cygwin.in | ||
| +++ Makefile.Cygwin.in | ||
| @@ -42,11 +42,13 @@ | ||
| 42 | 42 | INSTALLDIR =$(DESTDIR)@prefix@/bin |
| 43 | 43 | USE_SYSTEM_SQLITE = @USE_SYSTEM_SQLITE@ |
| 44 | 44 | FOSSIL_ENABLE_TCL = @FOSSIL_ENABLE_TCL@ |
| 45 | 45 | FOSSIL_ENABLE_TCL_STUBS = @FOSSIL_ENABLE_TCL_STUBS@ |
| 46 | 46 | FOSSIL_ENABLE_TCL_PRIVATE_STUBS = @FOSSIL_ENABLE_TCL_PRIVATE_STUBS@ |
| 47 | -SQLITE_CFLAGS += -DSQLITE_WIN32_NO_ANSI -DSQLITE_WINNT_MAX_PATH_CHARS=4096 -DSQLITE_MAX_MMAP_SIZE=0x7fff0000 | |
| 47 | +SQLITE_CFLAGS += -DSQLITE_WIN32_NO_ANSI | |
| 48 | +SQLITE_CFLAGS += -DSQLITE_WIN32_MAX_PATH_BYTES=4096 | |
| 49 | +SQLITE_CFLAGS += -DSQLITE_MAX_MMAP_SIZE=0x7fff0000 | |
| 48 | 50 | |
| 49 | 51 | include $(SRCDIR)/main.mk |
| 50 | 52 | |
| 51 | 53 | distclean: clean |
| 52 | 54 | rm -f autoconfig.h config.log Makefile |
| 53 | 55 |
| --- Makefile.Cygwin.in | |
| +++ Makefile.Cygwin.in | |
| @@ -42,11 +42,13 @@ | |
| 42 | INSTALLDIR =$(DESTDIR)@prefix@/bin |
| 43 | USE_SYSTEM_SQLITE = @USE_SYSTEM_SQLITE@ |
| 44 | FOSSIL_ENABLE_TCL = @FOSSIL_ENABLE_TCL@ |
| 45 | FOSSIL_ENABLE_TCL_STUBS = @FOSSIL_ENABLE_TCL_STUBS@ |
| 46 | FOSSIL_ENABLE_TCL_PRIVATE_STUBS = @FOSSIL_ENABLE_TCL_PRIVATE_STUBS@ |
| 47 | SQLITE_CFLAGS += -DSQLITE_WIN32_NO_ANSI -DSQLITE_WINNT_MAX_PATH_CHARS=4096 -DSQLITE_MAX_MMAP_SIZE=0x7fff0000 |
| 48 | |
| 49 | include $(SRCDIR)/main.mk |
| 50 | |
| 51 | distclean: clean |
| 52 | rm -f autoconfig.h config.log Makefile |
| 53 |
| --- Makefile.Cygwin.in | |
| +++ Makefile.Cygwin.in | |
| @@ -42,11 +42,13 @@ | |
| 42 | INSTALLDIR =$(DESTDIR)@prefix@/bin |
| 43 | USE_SYSTEM_SQLITE = @USE_SYSTEM_SQLITE@ |
| 44 | FOSSIL_ENABLE_TCL = @FOSSIL_ENABLE_TCL@ |
| 45 | FOSSIL_ENABLE_TCL_STUBS = @FOSSIL_ENABLE_TCL_STUBS@ |
| 46 | FOSSIL_ENABLE_TCL_PRIVATE_STUBS = @FOSSIL_ENABLE_TCL_PRIVATE_STUBS@ |
| 47 | SQLITE_CFLAGS += -DSQLITE_WIN32_NO_ANSI |
| 48 | SQLITE_CFLAGS += -DSQLITE_WIN32_MAX_PATH_BYTES=4096 |
| 49 | SQLITE_CFLAGS += -DSQLITE_MAX_MMAP_SIZE=0x7fff0000 |
| 50 | |
| 51 | include $(SRCDIR)/main.mk |
| 52 | |
| 53 | distclean: clean |
| 54 | rm -f autoconfig.h config.log Makefile |
| 55 |
-5
| --- src/main.c | ||
| +++ src/main.c | ||
| @@ -604,15 +604,10 @@ | ||
| 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__) && USE_SYSTEM_SQLITE+0!=1 | |
| 610 | - if( g.zVfsName==0 ){ | |
| 611 | - g.zVfsName = "win32-longpath"; | |
| 612 | - } | |
| 613 | -#endif | |
| 614 | 609 | } |
| 615 | 610 | if( g.zVfsName ){ |
| 616 | 611 | sqlite3_vfs *pVfs = sqlite3_vfs_find(g.zVfsName); |
| 617 | 612 | if( pVfs ){ |
| 618 | 613 | sqlite3_vfs_register(pVfs, 1); |
| 619 | 614 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -604,15 +604,10 @@ | |
| 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 | if( g.zVfsName ){ |
| 616 | sqlite3_vfs *pVfs = sqlite3_vfs_find(g.zVfsName); |
| 617 | if( pVfs ){ |
| 618 | sqlite3_vfs_register(pVfs, 1); |
| 619 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -604,15 +604,10 @@ | |
| 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 | } |
| 610 | if( g.zVfsName ){ |
| 611 | sqlite3_vfs *pVfs = sqlite3_vfs_find(g.zVfsName); |
| 612 | if( pVfs ){ |
| 613 | sqlite3_vfs_register(pVfs, 1); |
| 614 |