Fossil SCM

merge trunk

jan.nijtmans 2013-10-11 11:44 UTC fix-win64-mingw merge

Commit 1a310615b6b804655626586a2a83d64444c25927

Parent 57cf68c421c518b…

8 files changed -1 -1 +1 -1 +1 -1 +1 -1 +1 -1 +1 -1 -2

~ src/makemake.tcl ~ src/makemake.tcl ~ src/setup.c ~ win/Makefile.mingw ~ win/Makefile.mingw ~ win/Makefile.mingw.mistachkin ~ win/Makefile.mingw.mistachkin ~ win/fossil.rc

M src/makemake.tcl

-1

		--- src/makemake.tcl
		+++ src/makemake.tcl
		@@ -782,11 +782,10 @@
782	782	writeln "\$(OBJDIR)/json.o \$(OBJDIR)/json_artifact.o \$(OBJDIR)/json_branch.o \$(OBJDIR)/json_config.o \$(OBJDIR)/json_diff.o \$(OBJDIR)/json_dir.o \$(OBJDIR)/jsos_finfo.o \$(OBJDIR)/json_login.o \$(OBJDIR)/json_query.o \$(OBJDIR)/json_report.o \$(OBJDIR)/json_status.o \$(OBJDIR)/json_tag.o \$(OBJDIR)/json_timeline.o \$(OBJDIR)/json_user.o \$(OBJDIR)/json_wiki.o : \$(SRCDIR)/json_detail.h\n"
783	783
784	784	writeln "\$(OBJDIR)/shell.o:\t\$(SRCDIR)/shell.c \$(SRCDIR)/sqlite3.h"
785	785	set opt {-Dmain=sqlite3_shell}
786	786	append opt " -DSQLITE_OMIT_LOAD_EXTENSION=1"
787		-append opt " -D_HAVE_SQLITE_CONFIG_H"
788	787	writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/shell.c -o \$(OBJDIR)/shell.o\n"
789	788
790	789	writeln "\$(OBJDIR)/th.o:\t\$(SRCDIR)/th.c"
791	790	writeln "\t\$(XTCC) -c \$(SRCDIR)/th.c -o \$(OBJDIR)/th.o\n"
792	791
793	792

	--- src/makemake.tcl
	+++ src/makemake.tcl
	@@ -782,11 +782,10 @@
782	writeln "\$(OBJDIR)/json.o \$(OBJDIR)/json_artifact.o \$(OBJDIR)/json_branch.o \$(OBJDIR)/json_config.o \$(OBJDIR)/json_diff.o \$(OBJDIR)/json_dir.o \$(OBJDIR)/jsos_finfo.o \$(OBJDIR)/json_login.o \$(OBJDIR)/json_query.o \$(OBJDIR)/json_report.o \$(OBJDIR)/json_status.o \$(OBJDIR)/json_tag.o \$(OBJDIR)/json_timeline.o \$(OBJDIR)/json_user.o \$(OBJDIR)/json_wiki.o : \$(SRCDIR)/json_detail.h\n"
783
784	writeln "\$(OBJDIR)/shell.o:\t\$(SRCDIR)/shell.c \$(SRCDIR)/sqlite3.h"
785	set opt {-Dmain=sqlite3_shell}
786	append opt " -DSQLITE_OMIT_LOAD_EXTENSION=1"
787	append opt " -D_HAVE_SQLITE_CONFIG_H"
788	writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/shell.c -o \$(OBJDIR)/shell.o\n"
789
790	writeln "\$(OBJDIR)/th.o:\t\$(SRCDIR)/th.c"
791	writeln "\t\$(XTCC) -c \$(SRCDIR)/th.c -o \$(OBJDIR)/th.o\n"
792
793

	--- src/makemake.tcl
	+++ src/makemake.tcl
	@@ -782,11 +782,10 @@
782	writeln "\$(OBJDIR)/json.o \$(OBJDIR)/json_artifact.o \$(OBJDIR)/json_branch.o \$(OBJDIR)/json_config.o \$(OBJDIR)/json_diff.o \$(OBJDIR)/json_dir.o \$(OBJDIR)/jsos_finfo.o \$(OBJDIR)/json_login.o \$(OBJDIR)/json_query.o \$(OBJDIR)/json_report.o \$(OBJDIR)/json_status.o \$(OBJDIR)/json_tag.o \$(OBJDIR)/json_timeline.o \$(OBJDIR)/json_user.o \$(OBJDIR)/json_wiki.o : \$(SRCDIR)/json_detail.h\n"
783
784	writeln "\$(OBJDIR)/shell.o:\t\$(SRCDIR)/shell.c \$(SRCDIR)/sqlite3.h"
785	set opt {-Dmain=sqlite3_shell}
786	append opt " -DSQLITE_OMIT_LOAD_EXTENSION=1"

787	writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/shell.c -o \$(OBJDIR)/shell.o\n"
788
789	writeln "\$(OBJDIR)/th.o:\t\$(SRCDIR)/th.c"
790	writeln "\t\$(XTCC) -c \$(SRCDIR)/th.c -o \$(OBJDIR)/th.o\n"
791
792

M src/makemake.tcl

-1

		--- src/makemake.tcl
		+++ src/makemake.tcl
		@@ -782,11 +782,10 @@
782	782	writeln "\$(OBJDIR)/json.o \$(OBJDIR)/json_artifact.o \$(OBJDIR)/json_branch.o \$(OBJDIR)/json_config.o \$(OBJDIR)/json_diff.o \$(OBJDIR)/json_dir.o \$(OBJDIR)/jsos_finfo.o \$(OBJDIR)/json_login.o \$(OBJDIR)/json_query.o \$(OBJDIR)/json_report.o \$(OBJDIR)/json_status.o \$(OBJDIR)/json_tag.o \$(OBJDIR)/json_timeline.o \$(OBJDIR)/json_user.o \$(OBJDIR)/json_wiki.o : \$(SRCDIR)/json_detail.h\n"
783	783
784	784	writeln "\$(OBJDIR)/shell.o:\t\$(SRCDIR)/shell.c \$(SRCDIR)/sqlite3.h"
785	785	set opt {-Dmain=sqlite3_shell}
786	786	append opt " -DSQLITE_OMIT_LOAD_EXTENSION=1"
787		-append opt " -D_HAVE_SQLITE_CONFIG_H"
788	787	writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/shell.c -o \$(OBJDIR)/shell.o\n"
789	788
790	789	writeln "\$(OBJDIR)/th.o:\t\$(SRCDIR)/th.c"
791	790	writeln "\t\$(XTCC) -c \$(SRCDIR)/th.c -o \$(OBJDIR)/th.o\n"
792	791
793	792

	--- src/makemake.tcl
	+++ src/makemake.tcl
	@@ -782,11 +782,10 @@
782	writeln "\$(OBJDIR)/json.o \$(OBJDIR)/json_artifact.o \$(OBJDIR)/json_branch.o \$(OBJDIR)/json_config.o \$(OBJDIR)/json_diff.o \$(OBJDIR)/json_dir.o \$(OBJDIR)/jsos_finfo.o \$(OBJDIR)/json_login.o \$(OBJDIR)/json_query.o \$(OBJDIR)/json_report.o \$(OBJDIR)/json_status.o \$(OBJDIR)/json_tag.o \$(OBJDIR)/json_timeline.o \$(OBJDIR)/json_user.o \$(OBJDIR)/json_wiki.o : \$(SRCDIR)/json_detail.h\n"
783
784	writeln "\$(OBJDIR)/shell.o:\t\$(SRCDIR)/shell.c \$(SRCDIR)/sqlite3.h"
785	set opt {-Dmain=sqlite3_shell}
786	append opt " -DSQLITE_OMIT_LOAD_EXTENSION=1"
787	append opt " -D_HAVE_SQLITE_CONFIG_H"
788	writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/shell.c -o \$(OBJDIR)/shell.o\n"
789
790	writeln "\$(OBJDIR)/th.o:\t\$(SRCDIR)/th.c"
791	writeln "\t\$(XTCC) -c \$(SRCDIR)/th.c -o \$(OBJDIR)/th.o\n"
792
793

	--- src/makemake.tcl
	+++ src/makemake.tcl
	@@ -782,11 +782,10 @@
782	writeln "\$(OBJDIR)/json.o \$(OBJDIR)/json_artifact.o \$(OBJDIR)/json_branch.o \$(OBJDIR)/json_config.o \$(OBJDIR)/json_diff.o \$(OBJDIR)/json_dir.o \$(OBJDIR)/jsos_finfo.o \$(OBJDIR)/json_login.o \$(OBJDIR)/json_query.o \$(OBJDIR)/json_report.o \$(OBJDIR)/json_status.o \$(OBJDIR)/json_tag.o \$(OBJDIR)/json_timeline.o \$(OBJDIR)/json_user.o \$(OBJDIR)/json_wiki.o : \$(SRCDIR)/json_detail.h\n"
783
784	writeln "\$(OBJDIR)/shell.o:\t\$(SRCDIR)/shell.c \$(SRCDIR)/sqlite3.h"
785	set opt {-Dmain=sqlite3_shell}
786	append opt " -DSQLITE_OMIT_LOAD_EXTENSION=1"

787	writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/shell.c -o \$(OBJDIR)/shell.o\n"
788
789	writeln "\$(OBJDIR)/th.o:\t\$(SRCDIR)/th.c"
790	writeln "\t\$(XTCC) -c \$(SRCDIR)/th.c -o \$(OBJDIR)/th.o\n"
791
792

M src/setup.c

+1 -1

		--- src/setup.c
		+++ src/setup.c
		@@ -1496,11 +1496,11 @@
1496	1496	@ <p>When enabled, any change to tickets is subject to the approval
1497	1497	@ a ticket moderator - a user with the "q" or Mod-Tkt privilege.
1498	1498	@ Ticket changes enter the system and are shown locally, but are not
1499	1499	@ synced until they are approved. The moderator has the option to
1500	1500	@ delete the change rather than approve it. Ticket changes made by
1501		- @ a user who hwas the Mod-Tkt privilege are never subject to
	1501	+ @ a user who has the Mod-Tkt privilege are never subject to
1502	1502	@ moderation.
1503	1503	@
1504	1504	@ <hr />
1505	1505	onoff_attribute("Moderate wiki changes",
1506	1506	"modreq-wiki", "modreq-wiki", 0, 0);
1507	1507

	--- src/setup.c
	+++ src/setup.c
	@@ -1496,11 +1496,11 @@
1496	@ <p>When enabled, any change to tickets is subject to the approval
1497	@ a ticket moderator - a user with the "q" or Mod-Tkt privilege.
1498	@ Ticket changes enter the system and are shown locally, but are not
1499	@ synced until they are approved. The moderator has the option to
1500	@ delete the change rather than approve it. Ticket changes made by
1501	@ a user who hwas the Mod-Tkt privilege are never subject to
1502	@ moderation.
1503	@
1504	@ <hr />
1505	onoff_attribute("Moderate wiki changes",
1506	"modreq-wiki", "modreq-wiki", 0, 0);
1507

	--- src/setup.c
	+++ src/setup.c
	@@ -1496,11 +1496,11 @@
1496	@ <p>When enabled, any change to tickets is subject to the approval
1497	@ a ticket moderator - a user with the "q" or Mod-Tkt privilege.
1498	@ Ticket changes enter the system and are shown locally, but are not
1499	@ synced until they are approved. The moderator has the option to
1500	@ delete the change rather than approve it. Ticket changes made by
1501	@ a user who has the Mod-Tkt privilege are never subject to
1502	@ moderation.
1503	@
1504	@ <hr />
1505	onoff_attribute("Moderate wiki changes",
1506	"modreq-wiki", "modreq-wiki", 0, 0);
1507

M win/Makefile.mingw

+1 -1

		--- win/Makefile.mingw
		+++ win/Makefile.mingw
		@@ -1693,11 +1693,11 @@
1693	1693	$(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o
1694	1694
1695	1695	$(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_config.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_dir.o $(OBJDIR)/jsos_finfo.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_status.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h
1696	1696
1697	1697	$(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
1698		- $(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -D_HAVE_SQLITE_CONFIG_H -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
	1698	+ $(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
1699	1699
1700	1700	$(OBJDIR)/th.o: $(SRCDIR)/th.c
1701	1701	$(XTCC) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o
1702	1702
1703	1703	$(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c
1704	1704

	--- win/Makefile.mingw
	+++ win/Makefile.mingw
	@@ -1693,11 +1693,11 @@
1693	$(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o
1694
1695	$(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_config.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_dir.o $(OBJDIR)/jsos_finfo.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_status.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h
1696
1697	$(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
1698	$(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -D_HAVE_SQLITE_CONFIG_H -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
1699
1700	$(OBJDIR)/th.o: $(SRCDIR)/th.c
1701	$(XTCC) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o
1702
1703	$(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c
1704

	--- win/Makefile.mingw
	+++ win/Makefile.mingw
	@@ -1693,11 +1693,11 @@
1693	$(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o
1694
1695	$(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_config.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_dir.o $(OBJDIR)/jsos_finfo.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_status.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h
1696
1697	$(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
1698	$(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
1699
1700	$(OBJDIR)/th.o: $(SRCDIR)/th.c
1701	$(XTCC) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o
1702
1703	$(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c
1704

M win/Makefile.mingw

+1 -1

		--- win/Makefile.mingw
		+++ win/Makefile.mingw
		@@ -1693,11 +1693,11 @@
1693	1693	$(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o
1694	1694
1695	1695	$(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_config.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_dir.o $(OBJDIR)/jsos_finfo.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_status.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h
1696	1696
1697	1697	$(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
1698		- $(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -D_HAVE_SQLITE_CONFIG_H -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
	1698	+ $(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
1699	1699
1700	1700	$(OBJDIR)/th.o: $(SRCDIR)/th.c
1701	1701	$(XTCC) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o
1702	1702
1703	1703	$(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c
1704	1704

	--- win/Makefile.mingw
	+++ win/Makefile.mingw
	@@ -1693,11 +1693,11 @@
1693	$(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o
1694
1695	$(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_config.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_dir.o $(OBJDIR)/jsos_finfo.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_status.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h
1696
1697	$(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
1698	$(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -D_HAVE_SQLITE_CONFIG_H -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
1699
1700	$(OBJDIR)/th.o: $(SRCDIR)/th.c
1701	$(XTCC) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o
1702
1703	$(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c
1704

	--- win/Makefile.mingw
	+++ win/Makefile.mingw
	@@ -1693,11 +1693,11 @@
1693	$(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o
1694
1695	$(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_config.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_dir.o $(OBJDIR)/jsos_finfo.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_status.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h
1696
1697	$(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
1698	$(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
1699
1700	$(OBJDIR)/th.o: $(SRCDIR)/th.c
1701	$(XTCC) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o
1702
1703	$(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c
1704

M win/Makefile.mingw.mistachkin

+1 -1

		--- win/Makefile.mingw.mistachkin
		+++ win/Makefile.mingw.mistachkin
		@@ -1693,11 +1693,11 @@
1693	1693	$(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o
1694	1694
1695	1695	$(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_config.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_dir.o $(OBJDIR)/jsos_finfo.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_status.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h
1696	1696
1697	1697	$(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
1698		- $(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -D_HAVE_SQLITE_CONFIG_H -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
	1698	+ $(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
1699	1699
1700	1700	$(OBJDIR)/th.o: $(SRCDIR)/th.c
1701	1701	$(XTCC) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o
1702	1702
1703	1703	$(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c
1704	1704

	--- win/Makefile.mingw.mistachkin
	+++ win/Makefile.mingw.mistachkin
	@@ -1693,11 +1693,11 @@
1693	$(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o
1694
1695	$(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_config.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_dir.o $(OBJDIR)/jsos_finfo.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_status.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h
1696
1697	$(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
1698	$(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -D_HAVE_SQLITE_CONFIG_H -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
1699
1700	$(OBJDIR)/th.o: $(SRCDIR)/th.c
1701	$(XTCC) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o
1702
1703	$(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c
1704

	--- win/Makefile.mingw.mistachkin
	+++ win/Makefile.mingw.mistachkin
	@@ -1693,11 +1693,11 @@
1693	$(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o
1694
1695	$(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_config.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_dir.o $(OBJDIR)/jsos_finfo.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_status.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h
1696
1697	$(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
1698	$(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
1699
1700	$(OBJDIR)/th.o: $(SRCDIR)/th.c
1701	$(XTCC) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o
1702
1703	$(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c
1704

M win/Makefile.mingw.mistachkin

+1 -1

		--- win/Makefile.mingw.mistachkin
		+++ win/Makefile.mingw.mistachkin
		@@ -1693,11 +1693,11 @@
1693	1693	$(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o
1694	1694
1695	1695	$(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_config.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_dir.o $(OBJDIR)/jsos_finfo.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_status.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h
1696	1696
1697	1697	$(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
1698		- $(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -D_HAVE_SQLITE_CONFIG_H -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
	1698	+ $(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
1699	1699
1700	1700	$(OBJDIR)/th.o: $(SRCDIR)/th.c
1701	1701	$(XTCC) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o
1702	1702
1703	1703	$(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c
1704	1704

	--- win/Makefile.mingw.mistachkin
	+++ win/Makefile.mingw.mistachkin
	@@ -1693,11 +1693,11 @@
1693	$(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o
1694
1695	$(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_config.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_dir.o $(OBJDIR)/jsos_finfo.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_status.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h
1696
1697	$(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
1698	$(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -D_HAVE_SQLITE_CONFIG_H -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
1699
1700	$(OBJDIR)/th.o: $(SRCDIR)/th.c
1701	$(XTCC) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o
1702
1703	$(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c
1704

	--- win/Makefile.mingw.mistachkin
	+++ win/Makefile.mingw.mistachkin
	@@ -1693,11 +1693,11 @@
1693	$(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o
1694
1695	$(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_config.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_dir.o $(OBJDIR)/jsos_finfo.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_status.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h
1696
1697	$(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
1698	$(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
1699
1700	$(OBJDIR)/th.o: $(SRCDIR)/th.c
1701	$(XTCC) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o
1702
1703	$(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c
1704

M win/fossil.rc

-2

		--- win/fossil.rc
		+++ win/fossil.rc
		@@ -16,12 +16,10 @@
16	16	*******************************************************************************
17	17	**
18	18	** This file contains resource information for the executable on Windows.
19	19	*/
20	20
21		-#undef _USE_32BIT_TIME_T
22		-
23	21	#if !defined(_WIN32_WCE)
24	22	#include "winresrc.h"
25	23	#else
26	24	#include "windows.h"
27	25	#endif /* !defined(_WIN32_WCE) */
28	26

	--- win/fossil.rc
	+++ win/fossil.rc
	@@ -16,12 +16,10 @@
16	*******************************************************************************
17	**
18	** This file contains resource information for the executable on Windows.
19	*/
20
21	#undef _USE_32BIT_TIME_T
22
23	#if !defined(_WIN32_WCE)
24	#include "winresrc.h"
25	#else
26	#include "windows.h"
27	#endif /* !defined(_WIN32_WCE) */
28

	--- win/fossil.rc
	+++ win/fossil.rc
	@@ -16,12 +16,10 @@
16	*******************************************************************************
17	**
18	** This file contains resource information for the executable on Windows.
19	*/
20


21	#if !defined(_WIN32_WCE)
22	#include "winresrc.h"
23	#else
24	#include "windows.h"
25	#endif /* !defined(_WIN32_WCE) */
26

Keyboard Shortcuts

Open search /

Next entry (timeline) j

Previous entry (timeline) k

Open focused entry Enter

Show this help ?

Toggle theme Top nav button