Fossil SCM
Do not attempt to use fossil_fopen() in place of fopen() in the SQLite shell as doing so causes problems on (some) Macs and does not really help the windows i18n situation. Ticket [034fa7bb2907e96]
Commit
e94c1e9068161eff18bd6a775dfcddffaa7500b7
Parent
21ceccddd836d07…
2 files changed
+1
-1
-1
+1
-1
| --- src/main.mk | ||
| +++ src/main.mk | ||
| @@ -892,11 +892,11 @@ | ||
| 892 | 892 | $(OBJDIR)/zip.h: $(OBJDIR)/headers |
| 893 | 893 | $(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c |
| 894 | 894 | $(XTCC) -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_STAT2 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o |
| 895 | 895 | |
| 896 | 896 | $(OBJDIR)/shell.o: $(SRCDIR)/shell.c |
| 897 | - $(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -Dfopen=fossil_fopen -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o | |
| 897 | + $(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o | |
| 898 | 898 | |
| 899 | 899 | $(OBJDIR)/th.o: $(SRCDIR)/th.c |
| 900 | 900 | $(XTCC) -I$(SRCDIR) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o |
| 901 | 901 | |
| 902 | 902 | $(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c |
| 903 | 903 |
| --- src/main.mk | |
| +++ src/main.mk | |
| @@ -892,11 +892,11 @@ | |
| 892 | $(OBJDIR)/zip.h: $(OBJDIR)/headers |
| 893 | $(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c |
| 894 | $(XTCC) -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_STAT2 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o |
| 895 | |
| 896 | $(OBJDIR)/shell.o: $(SRCDIR)/shell.c |
| 897 | $(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -Dfopen=fossil_fopen -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o |
| 898 | |
| 899 | $(OBJDIR)/th.o: $(SRCDIR)/th.c |
| 900 | $(XTCC) -I$(SRCDIR) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o |
| 901 | |
| 902 | $(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c |
| 903 |
| --- src/main.mk | |
| +++ src/main.mk | |
| @@ -892,11 +892,11 @@ | |
| 892 | $(OBJDIR)/zip.h: $(OBJDIR)/headers |
| 893 | $(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c |
| 894 | $(XTCC) -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_STAT2 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o |
| 895 | |
| 896 | $(OBJDIR)/shell.o: $(SRCDIR)/shell.c |
| 897 | $(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o |
| 898 | |
| 899 | $(OBJDIR)/th.o: $(SRCDIR)/th.c |
| 900 | $(XTCC) -I$(SRCDIR) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o |
| 901 | |
| 902 | $(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c |
| 903 |
-1
| --- src/makemake.tcl | ||
| +++ src/makemake.tcl | ||
| @@ -250,11 +250,10 @@ | ||
| 250 | 250 | writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/sqlite3.c -o \$(OBJDIR)/sqlite3.o\n" |
| 251 | 251 | |
| 252 | 252 | writeln "\$(OBJDIR)/shell.o:\t\$(SRCDIR)/shell.c" |
| 253 | 253 | set opt {-Dmain=sqlite3_shell} |
| 254 | 254 | append opt " -DSQLITE_OMIT_LOAD_EXTENSION=1" |
| 255 | -append opt " -Dfopen=fossil_fopen" | |
| 256 | 255 | writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/shell.c -o \$(OBJDIR)/shell.o\n" |
| 257 | 256 | |
| 258 | 257 | writeln "\$(OBJDIR)/th.o:\t\$(SRCDIR)/th.c" |
| 259 | 258 | writeln "\t\$(XTCC) -I\$(SRCDIR) -c \$(SRCDIR)/th.c -o \$(OBJDIR)/th.o\n" |
| 260 | 259 | |
| 261 | 260 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -250,11 +250,10 @@ | |
| 250 | writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/sqlite3.c -o \$(OBJDIR)/sqlite3.o\n" |
| 251 | |
| 252 | writeln "\$(OBJDIR)/shell.o:\t\$(SRCDIR)/shell.c" |
| 253 | set opt {-Dmain=sqlite3_shell} |
| 254 | append opt " -DSQLITE_OMIT_LOAD_EXTENSION=1" |
| 255 | append opt " -Dfopen=fossil_fopen" |
| 256 | writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/shell.c -o \$(OBJDIR)/shell.o\n" |
| 257 | |
| 258 | writeln "\$(OBJDIR)/th.o:\t\$(SRCDIR)/th.c" |
| 259 | writeln "\t\$(XTCC) -I\$(SRCDIR) -c \$(SRCDIR)/th.c -o \$(OBJDIR)/th.o\n" |
| 260 | |
| 261 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -250,11 +250,10 @@ | |
| 250 | writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/sqlite3.c -o \$(OBJDIR)/sqlite3.o\n" |
| 251 | |
| 252 | writeln "\$(OBJDIR)/shell.o:\t\$(SRCDIR)/shell.c" |
| 253 | set opt {-Dmain=sqlite3_shell} |
| 254 | append opt " -DSQLITE_OMIT_LOAD_EXTENSION=1" |
| 255 | writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/shell.c -o \$(OBJDIR)/shell.o\n" |
| 256 | |
| 257 | writeln "\$(OBJDIR)/th.o:\t\$(SRCDIR)/th.c" |
| 258 | writeln "\t\$(XTCC) -I\$(SRCDIR) -c \$(SRCDIR)/th.c -o \$(OBJDIR)/th.o\n" |
| 259 | |
| 260 |