Fossil SCM

Add thread support to fossil, so SQLite can use additional threads for sorting (experimental)

jan.nijtmans 2014-09-01 20:40 trunk

Commit bc8b21d01cf3da988ec1c211fba5c381fe0694da

Parent c19b3f8846df4e5…

9 files changed +4 +1 -1 +1 -1 +1 -1 +1 -1 +1 -1 +1 -1 +1 -1 +1 -1

~ auto.def ~ src/main.c ~ src/main.mk ~ src/makemake.tcl ~ win/Makefile.PellesCGMake ~ win/Makefile.dmc ~ win/Makefile.mingw ~ win/Makefile.mingw.mistachkin ~ win/Makefile.msc

M auto.def

+4

		--- auto.def
		+++ auto.def
		@@ -291,8 +291,12 @@
291	291	define FOSSIL_HAVE_FUSEFS 1
292	292	define-append LIBS -lfuse
293	293	msg-result "FuseFS support enabled"
294	294	}
295	295	}
	296	+
	297	+if {[cc-check-function-in-lib pthread_create pthread]} {
	298	+ define-append LIBS -lpthread
	299	+}
296	300
297	301	make-template Makefile.in
298	302	make-config-header autoconfig.h -auto {USE_* FOSSIL_*}
299	303

	--- auto.def
	+++ auto.def
	@@ -291,8 +291,12 @@
291	define FOSSIL_HAVE_FUSEFS 1
292	define-append LIBS -lfuse
293	msg-result "FuseFS support enabled"
294	}
295	}




296
297	make-template Makefile.in
298	make-config-header autoconfig.h -auto {USE_* FOSSIL_*}
299

	--- auto.def
	+++ auto.def
	@@ -291,8 +291,12 @@
291	define FOSSIL_HAVE_FUSEFS 1
292	define-append LIBS -lfuse
293	msg-result "FuseFS support enabled"
294	}
295	}
296
297	if {[cc-check-function-in-lib pthread_create pthread]} {
298	define-append LIBS -lpthread
299	}
300
301	make-template Makefile.in
302	make-config-header autoconfig.h -auto {USE_* FOSSIL_*}
303

M src/main.c

+1 -1

		--- src/main.c
		+++ src/main.c
		@@ -576,11 +576,11 @@
576	576	int rc;
577	577	if( sqlite3_libversion_number()<3008003 ){
578	578	fossil_fatal("Unsuitable SQLite version %s, must be at least 3.8.3",
579	579	sqlite3_libversion());
580	580	}
581		- sqlite3_config(SQLITE_CONFIG_SINGLETHREAD);
	581	+ sqlite3_config(SQLITE_CONFIG_MULTITHREAD);
582	582	sqlite3_config(SQLITE_CONFIG_LOG, fossil_sqlite_log, 0);
583	583	memset(&g, 0, sizeof(g));
584	584	g.now = time(0);
585	585	g.httpHeader = empty_blob;
586	586	#ifdef FOSSIL_ENABLE_JSON
587	587

	--- src/main.c
	+++ src/main.c
	@@ -576,11 +576,11 @@
576	int rc;
577	if( sqlite3_libversion_number()<3008003 ){
578	fossil_fatal("Unsuitable SQLite version %s, must be at least 3.8.3",
579	sqlite3_libversion());
580	}
581	sqlite3_config(SQLITE_CONFIG_SINGLETHREAD);
582	sqlite3_config(SQLITE_CONFIG_LOG, fossil_sqlite_log, 0);
583	memset(&g, 0, sizeof(g));
584	g.now = time(0);
585	g.httpHeader = empty_blob;
586	#ifdef FOSSIL_ENABLE_JSON
587

	--- src/main.c
	+++ src/main.c
	@@ -576,11 +576,11 @@
576	int rc;
577	if( sqlite3_libversion_number()<3008003 ){
578	fossil_fatal("Unsuitable SQLite version %s, must be at least 3.8.3",
579	sqlite3_libversion());
580	}
581	sqlite3_config(SQLITE_CONFIG_MULTITHREAD);
582	sqlite3_config(SQLITE_CONFIG_LOG, fossil_sqlite_log, 0);
583	memset(&g, 0, sizeof(g));
584	g.now = time(0);
585	g.httpHeader = empty_blob;
586	#ifdef FOSSIL_ENABLE_JSON
587

M src/main.mk

+1 -1

		--- src/main.mk
		+++ src/main.mk
		@@ -388,11 +388,11 @@
388	388
389	389	# Setup the options used to compile the included SQLite library.
390	390	SQLITE_OPTIONS = -DNDEBUG=1 \
391	391	-DSQLITE_OMIT_LOAD_EXTENSION=1 \
392	392	-DSQLITE_ENABLE_LOCKING_STYLE=0 \
393		- -DSQLITE_THREADSAFE=0 \
	393	+ -DSQLITE_THREADSAFE=2 \
394	394	-DSQLITE_DEFAULT_FILE_FORMAT=4 \
395	395	-DSQLITE_OMIT_DEPRECATED \
396	396	-DSQLITE_ENABLE_EXPLAIN_COMMENTS
397	397
398	398	# Setup the options used to compile the included SQLite shell.
399	399

	--- src/main.mk
	+++ src/main.mk
	@@ -388,11 +388,11 @@
388
389	# Setup the options used to compile the included SQLite library.
390	SQLITE_OPTIONS = -DNDEBUG=1 \
391	-DSQLITE_OMIT_LOAD_EXTENSION=1 \
392	-DSQLITE_ENABLE_LOCKING_STYLE=0 \
393	-DSQLITE_THREADSAFE=0 \
394	-DSQLITE_DEFAULT_FILE_FORMAT=4 \
395	-DSQLITE_OMIT_DEPRECATED \
396	-DSQLITE_ENABLE_EXPLAIN_COMMENTS
397
398	# Setup the options used to compile the included SQLite shell.
399

	--- src/main.mk
	+++ src/main.mk
	@@ -388,11 +388,11 @@
388
389	# Setup the options used to compile the included SQLite library.
390	SQLITE_OPTIONS = -DNDEBUG=1 \
391	-DSQLITE_OMIT_LOAD_EXTENSION=1 \
392	-DSQLITE_ENABLE_LOCKING_STYLE=0 \
393	-DSQLITE_THREADSAFE=2 \
394	-DSQLITE_DEFAULT_FILE_FORMAT=4 \
395	-DSQLITE_OMIT_DEPRECATED \
396	-DSQLITE_ENABLE_EXPLAIN_COMMENTS
397
398	# Setup the options used to compile the included SQLite shell.
399

M src/makemake.tcl

+1 -1

		--- src/makemake.tcl
		+++ src/makemake.tcl
		@@ -135,11 +135,11 @@
135	135	#
136	136	set SQLITE_OPTIONS {
137	137	-DNDEBUG=1
138	138	-DSQLITE_OMIT_LOAD_EXTENSION=1
139	139	-DSQLITE_ENABLE_LOCKING_STYLE=0
140		- -DSQLITE_THREADSAFE=0
	140	+ -DSQLITE_THREADSAFE=2
141	141	-DSQLITE_DEFAULT_FILE_FORMAT=4
142	142	-DSQLITE_OMIT_DEPRECATED
143	143	-DSQLITE_ENABLE_EXPLAIN_COMMENTS
144	144	}
145	145	#lappend SQLITE_OPTIONS -DSQLITE_ENABLE_FTS3=1
146	146

	--- src/makemake.tcl
	+++ src/makemake.tcl
	@@ -135,11 +135,11 @@
135	#
136	set SQLITE_OPTIONS {
137	-DNDEBUG=1
138	-DSQLITE_OMIT_LOAD_EXTENSION=1
139	-DSQLITE_ENABLE_LOCKING_STYLE=0
140	-DSQLITE_THREADSAFE=0
141	-DSQLITE_DEFAULT_FILE_FORMAT=4
142	-DSQLITE_OMIT_DEPRECATED
143	-DSQLITE_ENABLE_EXPLAIN_COMMENTS
144	}
145	#lappend SQLITE_OPTIONS -DSQLITE_ENABLE_FTS3=1
146

	--- src/makemake.tcl
	+++ src/makemake.tcl
	@@ -135,11 +135,11 @@
135	#
136	set SQLITE_OPTIONS {
137	-DNDEBUG=1
138	-DSQLITE_OMIT_LOAD_EXTENSION=1
139	-DSQLITE_ENABLE_LOCKING_STYLE=0
140	-DSQLITE_THREADSAFE=2
141	-DSQLITE_DEFAULT_FILE_FORMAT=4
142	-DSQLITE_OMIT_DEPRECATED
143	-DSQLITE_ENABLE_EXPLAIN_COMMENTS
144	}
145	#lappend SQLITE_OPTIONS -DSQLITE_ENABLE_FTS3=1
146

M win/Makefile.PellesCGMake

+1 -1

		--- win/Makefile.PellesCGMake
		+++ win/Makefile.PellesCGMake
		@@ -83,11 +83,11 @@
83	83
84	84	# define the sqlite files, which need special flags on compile
85	85	SQLITESRC=sqlite3.c
86	86	ORIGSQLITESRC=$(foreach sf,$(SQLITESRC),$(SRCDIR)$(sf))
87	87	SQLITEOBJ=$(foreach sf,$(SQLITESRC),$(sf:.c=.obj))
88		-SQLITEDEFINES=-DNDEBUG=1 -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_OMIT_DEPRECATED -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_WIN32_NO_ANSI
	88	+SQLITEDEFINES=-DNDEBUG=1 -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_THREADSAFE=2 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_OMIT_DEPRECATED -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_WIN32_NO_ANSI
89	89
90	90	# define the sqlite shell files, which need special flags on compile
91	91	SQLITESHELLSRC=shell.c
92	92	ORIGSQLITESHELLSRC=$(foreach sf,$(SQLITESHELLSRC),$(SRCDIR)$(sf))
93	93	SQLITESHELLOBJ=$(foreach sf,$(SQLITESHELLSRC),$(sf:.c=.obj))
94	94

	--- win/Makefile.PellesCGMake
	+++ win/Makefile.PellesCGMake
	@@ -83,11 +83,11 @@
83
84	# define the sqlite files, which need special flags on compile
85	SQLITESRC=sqlite3.c
86	ORIGSQLITESRC=$(foreach sf,$(SQLITESRC),$(SRCDIR)$(sf))
87	SQLITEOBJ=$(foreach sf,$(SQLITESRC),$(sf:.c=.obj))
88	SQLITEDEFINES=-DNDEBUG=1 -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_OMIT_DEPRECATED -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_WIN32_NO_ANSI
89
90	# define the sqlite shell files, which need special flags on compile
91	SQLITESHELLSRC=shell.c
92	ORIGSQLITESHELLSRC=$(foreach sf,$(SQLITESHELLSRC),$(SRCDIR)$(sf))
93	SQLITESHELLOBJ=$(foreach sf,$(SQLITESHELLSRC),$(sf:.c=.obj))
94

	--- win/Makefile.PellesCGMake
	+++ win/Makefile.PellesCGMake
	@@ -83,11 +83,11 @@
83
84	# define the sqlite files, which need special flags on compile
85	SQLITESRC=sqlite3.c
86	ORIGSQLITESRC=$(foreach sf,$(SQLITESRC),$(SRCDIR)$(sf))
87	SQLITEOBJ=$(foreach sf,$(SQLITESRC),$(sf:.c=.obj))
88	SQLITEDEFINES=-DNDEBUG=1 -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_THREADSAFE=2 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_OMIT_DEPRECATED -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_WIN32_NO_ANSI
89
90	# define the sqlite shell files, which need special flags on compile
91	SQLITESHELLSRC=shell.c
92	ORIGSQLITESHELLSRC=$(foreach sf,$(SQLITESHELLSRC),$(SRCDIR)$(sf))
93	SQLITESHELLOBJ=$(foreach sf,$(SQLITESHELLSRC),$(sf:.c=.obj))
94

M win/Makefile.dmc

+1 -1

		--- win/Makefile.dmc
		+++ win/Makefile.dmc
		@@ -24,11 +24,11 @@
24	24	CFLAGS = -o
25	25	BCC = $(DMDIR)\bin\dmc $(CFLAGS)
26	26	TCC = $(DMDIR)\bin\dmc $(CFLAGS) $(DMCDEF) $(SSL) $(INCL)
27	27	LIBS = $(DMDIR)\extra\lib\ zlib wsock32 advapi32
28	28
29		-SQLITE_OPTIONS = -DNDEBUG=1 -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_OMIT_DEPRECATED -DSQLITE_ENABLE_EXPLAIN_COMMENTS
	29	+SQLITE_OPTIONS = -DNDEBUG=1 -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_THREADSAFE=2 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_OMIT_DEPRECATED -DSQLITE_ENABLE_EXPLAIN_COMMENTS
30	30
31	31	SHELL_OPTIONS = -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -DUSE_SYSTEM_SQLITE=$(USE_SYSTEM_SQLITE) -DSQLITE_SHELL_DBNAME_PROC=fossil_open -Daccess=file_access -Dsystem=fossil_system -Dgetenv=fossil_getenv -Dfopen=fossil_fopen
32	32
33	33	SRC = add_.c allrepo_.c attach_.c bag_.c bisect_.c blob_.c branch_.c browse_.c cache_.c captcha_.c cgi_.c checkin_.c checkout_.c clearsign_.c clone_.c comformat_.c configure_.c content_.c db_.c delta_.c deltacmd_.c descendants_.c diff_.c diffcmd_.c doc_.c encode_.c event_.c export_.c file_.c finfo_.c fusefs_.c glob_.c graph_.c gzip_.c http_.c http_socket_.c http_ssl_.c http_transport_.c import_.c info_.c json_.c json_artifact_.c json_branch_.c json_config_.c json_diff_.c json_dir_.c json_finfo_.c json_login_.c json_query_.c json_report_.c json_status_.c json_tag_.c json_timeline_.c json_user_.c json_wiki_.c leaf_.c loadctrl_.c login_.c lookslike_.c main_.c manifest_.c markdown_.c markdown_html_.c md5_.c merge_.c merge3_.c moderate_.c name_.c path_.c pivot_.c popen_.c pqueue_.c printf_.c rebuild_.c regexp_.c report_.c rss_.c schema_.c search_.c setup_.c sha1_.c shun_.c skins_.c sqlcmd_.c stash_.c stat_.c style_.c sync_.c tag_.c tar_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c unicode_.c update_.c url_.c user_.c utf8_.c util_.c verify_.c vfile_.c wiki_.c wikiformat_.c winfile_.c winhttp_.c wysiwyg_.c xfer_.c xfersetup_.c zip_.c
34	34
35	35

	--- win/Makefile.dmc
	+++ win/Makefile.dmc
	@@ -24,11 +24,11 @@
24	CFLAGS = -o
25	BCC = $(DMDIR)\bin\dmc $(CFLAGS)
26	TCC = $(DMDIR)\bin\dmc $(CFLAGS) $(DMCDEF) $(SSL) $(INCL)
27	LIBS = $(DMDIR)\extra\lib\ zlib wsock32 advapi32
28
29	SQLITE_OPTIONS = -DNDEBUG=1 -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_OMIT_DEPRECATED -DSQLITE_ENABLE_EXPLAIN_COMMENTS
30
31	SHELL_OPTIONS = -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -DUSE_SYSTEM_SQLITE=$(USE_SYSTEM_SQLITE) -DSQLITE_SHELL_DBNAME_PROC=fossil_open -Daccess=file_access -Dsystem=fossil_system -Dgetenv=fossil_getenv -Dfopen=fossil_fopen
32
33	SRC = add_.c allrepo_.c attach_.c bag_.c bisect_.c blob_.c branch_.c browse_.c cache_.c captcha_.c cgi_.c checkin_.c checkout_.c clearsign_.c clone_.c comformat_.c configure_.c content_.c db_.c delta_.c deltacmd_.c descendants_.c diff_.c diffcmd_.c doc_.c encode_.c event_.c export_.c file_.c finfo_.c fusefs_.c glob_.c graph_.c gzip_.c http_.c http_socket_.c http_ssl_.c http_transport_.c import_.c info_.c json_.c json_artifact_.c json_branch_.c json_config_.c json_diff_.c json_dir_.c json_finfo_.c json_login_.c json_query_.c json_report_.c json_status_.c json_tag_.c json_timeline_.c json_user_.c json_wiki_.c leaf_.c loadctrl_.c login_.c lookslike_.c main_.c manifest_.c markdown_.c markdown_html_.c md5_.c merge_.c merge3_.c moderate_.c name_.c path_.c pivot_.c popen_.c pqueue_.c printf_.c rebuild_.c regexp_.c report_.c rss_.c schema_.c search_.c setup_.c sha1_.c shun_.c skins_.c sqlcmd_.c stash_.c stat_.c style_.c sync_.c tag_.c tar_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c unicode_.c update_.c url_.c user_.c utf8_.c util_.c verify_.c vfile_.c wiki_.c wikiformat_.c winfile_.c winhttp_.c wysiwyg_.c xfer_.c xfersetup_.c zip_.c
34
35

	--- win/Makefile.dmc
	+++ win/Makefile.dmc
	@@ -24,11 +24,11 @@
24	CFLAGS = -o
25	BCC = $(DMDIR)\bin\dmc $(CFLAGS)
26	TCC = $(DMDIR)\bin\dmc $(CFLAGS) $(DMCDEF) $(SSL) $(INCL)
27	LIBS = $(DMDIR)\extra\lib\ zlib wsock32 advapi32
28
29	SQLITE_OPTIONS = -DNDEBUG=1 -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_THREADSAFE=2 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_OMIT_DEPRECATED -DSQLITE_ENABLE_EXPLAIN_COMMENTS
30
31	SHELL_OPTIONS = -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -DUSE_SYSTEM_SQLITE=$(USE_SYSTEM_SQLITE) -DSQLITE_SHELL_DBNAME_PROC=fossil_open -Daccess=file_access -Dsystem=fossil_system -Dgetenv=fossil_getenv -Dfopen=fossil_fopen
32
33	SRC = add_.c allrepo_.c attach_.c bag_.c bisect_.c blob_.c branch_.c browse_.c cache_.c captcha_.c cgi_.c checkin_.c checkout_.c clearsign_.c clone_.c comformat_.c configure_.c content_.c db_.c delta_.c deltacmd_.c descendants_.c diff_.c diffcmd_.c doc_.c encode_.c event_.c export_.c file_.c finfo_.c fusefs_.c glob_.c graph_.c gzip_.c http_.c http_socket_.c http_ssl_.c http_transport_.c import_.c info_.c json_.c json_artifact_.c json_branch_.c json_config_.c json_diff_.c json_dir_.c json_finfo_.c json_login_.c json_query_.c json_report_.c json_status_.c json_tag_.c json_timeline_.c json_user_.c json_wiki_.c leaf_.c loadctrl_.c login_.c lookslike_.c main_.c manifest_.c markdown_.c markdown_html_.c md5_.c merge_.c merge3_.c moderate_.c name_.c path_.c pivot_.c popen_.c pqueue_.c printf_.c rebuild_.c regexp_.c report_.c rss_.c schema_.c search_.c setup_.c sha1_.c shun_.c skins_.c sqlcmd_.c stash_.c stat_.c style_.c sync_.c tag_.c tar_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c unicode_.c update_.c url_.c user_.c utf8_.c util_.c verify_.c vfile_.c wiki_.c wikiformat_.c winfile_.c winhttp_.c wysiwyg_.c xfer_.c xfersetup_.c zip_.c
34
35

M win/Makefile.mingw

+1 -1

		--- win/Makefile.mingw
		+++ win/Makefile.mingw
		@@ -1835,11 +1835,11 @@
1835	1835	$(OBJDIR)/zip.h: $(OBJDIR)/headers
1836	1836
1837	1837	SQLITE_OPTIONS = -DNDEBUG=1 \
1838	1838	-DSQLITE_OMIT_LOAD_EXTENSION=1 \
1839	1839	-DSQLITE_ENABLE_LOCKING_STYLE=0 \
1840		- -DSQLITE_THREADSAFE=0 \
	1840	+ -DSQLITE_THREADSAFE=2 \
1841	1841	-DSQLITE_DEFAULT_FILE_FORMAT=4 \
1842	1842	-DSQLITE_OMIT_DEPRECATED \
1843	1843	-DSQLITE_ENABLE_EXPLAIN_COMMENTS \
1844	1844	-DSQLITE_WIN32_NO_ANSI \
1845	1845	-D_HAVE__MINGW_H \
1846	1846

	--- win/Makefile.mingw
	+++ win/Makefile.mingw
	@@ -1835,11 +1835,11 @@
1835	$(OBJDIR)/zip.h: $(OBJDIR)/headers
1836
1837	SQLITE_OPTIONS = -DNDEBUG=1 \
1838	-DSQLITE_OMIT_LOAD_EXTENSION=1 \
1839	-DSQLITE_ENABLE_LOCKING_STYLE=0 \
1840	-DSQLITE_THREADSAFE=0 \
1841	-DSQLITE_DEFAULT_FILE_FORMAT=4 \
1842	-DSQLITE_OMIT_DEPRECATED \
1843	-DSQLITE_ENABLE_EXPLAIN_COMMENTS \
1844	-DSQLITE_WIN32_NO_ANSI \
1845	-D_HAVE__MINGW_H \
1846

	--- win/Makefile.mingw
	+++ win/Makefile.mingw
	@@ -1835,11 +1835,11 @@
1835	$(OBJDIR)/zip.h: $(OBJDIR)/headers
1836
1837	SQLITE_OPTIONS = -DNDEBUG=1 \
1838	-DSQLITE_OMIT_LOAD_EXTENSION=1 \
1839	-DSQLITE_ENABLE_LOCKING_STYLE=0 \
1840	-DSQLITE_THREADSAFE=2 \
1841	-DSQLITE_DEFAULT_FILE_FORMAT=4 \
1842	-DSQLITE_OMIT_DEPRECATED \
1843	-DSQLITE_ENABLE_EXPLAIN_COMMENTS \
1844	-DSQLITE_WIN32_NO_ANSI \
1845	-D_HAVE__MINGW_H \
1846

M win/Makefile.mingw.mistachkin

+1 -1

		--- win/Makefile.mingw.mistachkin
		+++ win/Makefile.mingw.mistachkin
		@@ -1835,11 +1835,11 @@
1835	1835	$(OBJDIR)/zip.h: $(OBJDIR)/headers
1836	1836
1837	1837	SQLITE_OPTIONS = -DNDEBUG=1 \
1838	1838	-DSQLITE_OMIT_LOAD_EXTENSION=1 \
1839	1839	-DSQLITE_ENABLE_LOCKING_STYLE=0 \
1840		- -DSQLITE_THREADSAFE=0 \
	1840	+ -DSQLITE_THREADSAFE=2 \
1841	1841	-DSQLITE_DEFAULT_FILE_FORMAT=4 \
1842	1842	-DSQLITE_OMIT_DEPRECATED \
1843	1843	-DSQLITE_ENABLE_EXPLAIN_COMMENTS \
1844	1844	-DSQLITE_WIN32_NO_ANSI \
1845	1845	-D_HAVE__MINGW_H \
1846	1846

	--- win/Makefile.mingw.mistachkin
	+++ win/Makefile.mingw.mistachkin
	@@ -1835,11 +1835,11 @@
1835	$(OBJDIR)/zip.h: $(OBJDIR)/headers
1836
1837	SQLITE_OPTIONS = -DNDEBUG=1 \
1838	-DSQLITE_OMIT_LOAD_EXTENSION=1 \
1839	-DSQLITE_ENABLE_LOCKING_STYLE=0 \
1840	-DSQLITE_THREADSAFE=0 \
1841	-DSQLITE_DEFAULT_FILE_FORMAT=4 \
1842	-DSQLITE_OMIT_DEPRECATED \
1843	-DSQLITE_ENABLE_EXPLAIN_COMMENTS \
1844	-DSQLITE_WIN32_NO_ANSI \
1845	-D_HAVE__MINGW_H \
1846

	--- win/Makefile.mingw.mistachkin
	+++ win/Makefile.mingw.mistachkin
	@@ -1835,11 +1835,11 @@
1835	$(OBJDIR)/zip.h: $(OBJDIR)/headers
1836
1837	SQLITE_OPTIONS = -DNDEBUG=1 \
1838	-DSQLITE_OMIT_LOAD_EXTENSION=1 \
1839	-DSQLITE_ENABLE_LOCKING_STYLE=0 \
1840	-DSQLITE_THREADSAFE=2 \
1841	-DSQLITE_DEFAULT_FILE_FORMAT=4 \
1842	-DSQLITE_OMIT_DEPRECATED \
1843	-DSQLITE_ENABLE_EXPLAIN_COMMENTS \
1844	-DSQLITE_WIN32_NO_ANSI \
1845	-D_HAVE__MINGW_H \
1846

M win/Makefile.msc

+1 -1

		--- win/Makefile.msc
		+++ win/Makefile.msc
		@@ -122,11 +122,11 @@
122	122	!endif
123	123
124	124	SQLITE_OPTIONS = /DNDEBUG=1 \
125	125	/DSQLITE_OMIT_LOAD_EXTENSION=1 \
126	126	/DSQLITE_ENABLE_LOCKING_STYLE=0 \
127		- /DSQLITE_THREADSAFE=0 \
	127	+ /DSQLITE_THREADSAFE=2 \
128	128	/DSQLITE_DEFAULT_FILE_FORMAT=4 \
129	129	/DSQLITE_OMIT_DEPRECATED \
130	130	/DSQLITE_ENABLE_EXPLAIN_COMMENTS \
131	131	/DSQLITE_WIN32_NO_ANSI
132	132
133	133

	--- win/Makefile.msc
	+++ win/Makefile.msc
	@@ -122,11 +122,11 @@
122	!endif
123
124	SQLITE_OPTIONS = /DNDEBUG=1 \
125	/DSQLITE_OMIT_LOAD_EXTENSION=1 \
126	/DSQLITE_ENABLE_LOCKING_STYLE=0 \
127	/DSQLITE_THREADSAFE=0 \
128	/DSQLITE_DEFAULT_FILE_FORMAT=4 \
129	/DSQLITE_OMIT_DEPRECATED \
130	/DSQLITE_ENABLE_EXPLAIN_COMMENTS \
131	/DSQLITE_WIN32_NO_ANSI
132
133

	--- win/Makefile.msc
	+++ win/Makefile.msc
	@@ -122,11 +122,11 @@
122	!endif
123
124	SQLITE_OPTIONS = /DNDEBUG=1 \
125	/DSQLITE_OMIT_LOAD_EXTENSION=1 \
126	/DSQLITE_ENABLE_LOCKING_STYLE=0 \
127	/DSQLITE_THREADSAFE=2 \
128	/DSQLITE_DEFAULT_FILE_FORMAT=4 \
129	/DSQLITE_OMIT_DEPRECATED \
130	/DSQLITE_ENABLE_EXPLAIN_COMMENTS \
131	/DSQLITE_WIN32_NO_ANSI
132
133

Keyboard Shortcuts

Open search /

Next entry (timeline) j

Previous entry (timeline) k

Open focused entry Enter

Show this help ?

Toggle theme Top nav button