Fossil SCM
Back out [9b3aa63940] because it doesn't work on an Ubuntu->windows cross-compile. The only solution is to dirty-up the SQLite shell.c code.
Commit
3d7eaeda866cc831d59abe2b1ddf15184aa14c4a
Parent
9b3aa6e940c2253…
3 files changed
+1
-1
+3
-1
+1
-1
+1
-1
| --- src/makemake.tcl | ||
| +++ src/makemake.tcl | ||
| @@ -153,11 +153,11 @@ | ||
| 153 | 153 | } |
| 154 | 154 | |
| 155 | 155 | # Options used to compile the included SQLite shell on Windows. |
| 156 | 156 | # |
| 157 | 157 | set SHELL_WIN32_OPTIONS $SHELL_OPTIONS |
| 158 | -lappend SHELL_WIN32_OPTIONS -D_access=win32_access | |
| 158 | +lappend SHELL_WIN32_OPTIONS -Daccess=win32_access | |
| 159 | 159 | lappend SHELL_WIN32_OPTIONS -Dgetenv=fossil_getenv |
| 160 | 160 | lappend SHELL_WIN32_OPTIONS -Dfopen=fossil_fopen |
| 161 | 161 | |
| 162 | 162 | # Name of the final application |
| 163 | 163 | # |
| 164 | 164 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -153,11 +153,11 @@ | |
| 153 | } |
| 154 | |
| 155 | # Options used to compile the included SQLite shell on Windows. |
| 156 | # |
| 157 | set SHELL_WIN32_OPTIONS $SHELL_OPTIONS |
| 158 | lappend SHELL_WIN32_OPTIONS -D_access=win32_access |
| 159 | lappend SHELL_WIN32_OPTIONS -Dgetenv=fossil_getenv |
| 160 | lappend SHELL_WIN32_OPTIONS -Dfopen=fossil_fopen |
| 161 | |
| 162 | # Name of the final application |
| 163 | # |
| 164 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -153,11 +153,11 @@ | |
| 153 | } |
| 154 | |
| 155 | # Options used to compile the included SQLite shell on Windows. |
| 156 | # |
| 157 | set SHELL_WIN32_OPTIONS $SHELL_OPTIONS |
| 158 | lappend SHELL_WIN32_OPTIONS -Daccess=win32_access |
| 159 | lappend SHELL_WIN32_OPTIONS -Dgetenv=fossil_getenv |
| 160 | lappend SHELL_WIN32_OPTIONS -Dfopen=fossil_fopen |
| 161 | |
| 162 | # Name of the final application |
| 163 | # |
| 164 |
+3
-1
| --- src/shell.c | ||
| +++ src/shell.c | ||
| @@ -63,11 +63,13 @@ | ||
| 63 | 63 | #endif |
| 64 | 64 | |
| 65 | 65 | #if defined(_WIN32) || defined(WIN32) |
| 66 | 66 | # include <io.h> |
| 67 | 67 | #define isatty(h) _isatty(h) |
| 68 | -#define access(f,m) _access((f),(m)) | |
| 68 | +#ifndef access | |
| 69 | +# define access(f,m) _access((f),(m)) | |
| 70 | +#endif | |
| 69 | 71 | #undef popen |
| 70 | 72 | #define popen _popen |
| 71 | 73 | #undef pclose |
| 72 | 74 | #define pclose _pclose |
| 73 | 75 | #else |
| 74 | 76 |
| --- src/shell.c | |
| +++ src/shell.c | |
| @@ -63,11 +63,13 @@ | |
| 63 | #endif |
| 64 | |
| 65 | #if defined(_WIN32) || defined(WIN32) |
| 66 | # include <io.h> |
| 67 | #define isatty(h) _isatty(h) |
| 68 | #define access(f,m) _access((f),(m)) |
| 69 | #undef popen |
| 70 | #define popen _popen |
| 71 | #undef pclose |
| 72 | #define pclose _pclose |
| 73 | #else |
| 74 |
| --- src/shell.c | |
| +++ src/shell.c | |
| @@ -63,11 +63,13 @@ | |
| 63 | #endif |
| 64 | |
| 65 | #if defined(_WIN32) || defined(WIN32) |
| 66 | # include <io.h> |
| 67 | #define isatty(h) _isatty(h) |
| 68 | #ifndef access |
| 69 | # define access(f,m) _access((f),(m)) |
| 70 | #endif |
| 71 | #undef popen |
| 72 | #define popen _popen |
| 73 | #undef pclose |
| 74 | #define pclose _pclose |
| 75 | #else |
| 76 |
+1
-1
| --- win/Makefile.mingw.mistachkin | ||
| +++ win/Makefile.mingw.mistachkin | ||
| @@ -1712,11 +1712,11 @@ | ||
| 1712 | 1712 | |
| 1713 | 1713 | SHELL_OPTIONS = -Dmain=sqlite3_shell \ |
| 1714 | 1714 | -DSQLITE_OMIT_LOAD_EXTENSION=1 \ |
| 1715 | 1715 | -DUSE_SYSTEM_SQLITE=$(USE_SYSTEM_SQLITE) \ |
| 1716 | 1716 | -DSQLITE_SHELL_DBNAME_PROC=fossil_open \ |
| 1717 | - -D_access=win32_access \ | |
| 1717 | + -Daccess=win32_access \ | |
| 1718 | 1718 | -Dgetenv=fossil_getenv \ |
| 1719 | 1719 | -Dfopen=fossil_fopen |
| 1720 | 1720 | |
| 1721 | 1721 | $(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c $(SRCDIR)/../win/Makefile.mingw.mistachkin |
| 1722 | 1722 | $(XTCC) $(SQLITE_OPTIONS) $(SQLITE_CFLAGS) -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o |
| 1723 | 1723 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -1712,11 +1712,11 @@ | |
| 1712 | |
| 1713 | SHELL_OPTIONS = -Dmain=sqlite3_shell \ |
| 1714 | -DSQLITE_OMIT_LOAD_EXTENSION=1 \ |
| 1715 | -DUSE_SYSTEM_SQLITE=$(USE_SYSTEM_SQLITE) \ |
| 1716 | -DSQLITE_SHELL_DBNAME_PROC=fossil_open \ |
| 1717 | -D_access=win32_access \ |
| 1718 | -Dgetenv=fossil_getenv \ |
| 1719 | -Dfopen=fossil_fopen |
| 1720 | |
| 1721 | $(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c $(SRCDIR)/../win/Makefile.mingw.mistachkin |
| 1722 | $(XTCC) $(SQLITE_OPTIONS) $(SQLITE_CFLAGS) -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o |
| 1723 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -1712,11 +1712,11 @@ | |
| 1712 | |
| 1713 | SHELL_OPTIONS = -Dmain=sqlite3_shell \ |
| 1714 | -DSQLITE_OMIT_LOAD_EXTENSION=1 \ |
| 1715 | -DUSE_SYSTEM_SQLITE=$(USE_SYSTEM_SQLITE) \ |
| 1716 | -DSQLITE_SHELL_DBNAME_PROC=fossil_open \ |
| 1717 | -Daccess=win32_access \ |
| 1718 | -Dgetenv=fossil_getenv \ |
| 1719 | -Dfopen=fossil_fopen |
| 1720 | |
| 1721 | $(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c $(SRCDIR)/../win/Makefile.mingw.mistachkin |
| 1722 | $(XTCC) $(SQLITE_OPTIONS) $(SQLITE_CFLAGS) -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o |
| 1723 |