Fossil SCM

Here is an altenative fix to [8b3c5d30f7e] that explicitly disables the LOCKING_STYLE option of SQLite.

drh 2010-03-04 23:41 UTC trunk
Commit 879a030e1cea3568aa08bab0bb52f859aeef6783
Parent 73223b8bd62bab6…
4 files changed +1 -1 +1 +3 -6 +1 -1
~ src/main.mk ~ src/makemake.tcl ~ src/sqlite3.c ~ src/sqlite3.h
M src/main.mk
+1 -1
--- src/main.mk
+++ src/main.mk
@@ -780,11 +780,11 @@
780780
 $(OBJDIR)/zip.o: zip_.c zip.h $(SRCDIR)/config.h
781781
 $(XTCC) -o $(OBJDIR)/zip.o -c zip_.c
782782
783783
 zip.h: headers
784784
 $(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c
785
- $(XTCC) -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -Dlocaltime=fossil_localtime -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
785
+ $(XTCC) -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
786786
787787
 $(OBJDIR)/th.o: $(SRCDIR)/th.c
788788
 $(XTCC) -I$(SRCDIR) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o
789789
790790
 $(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c
791791
--- src/main.mk
+++ src/main.mk
@@ -780,11 +780,11 @@
780 $(OBJDIR)/zip.o: zip_.c zip.h $(SRCDIR)/config.h
781 $(XTCC) -o $(OBJDIR)/zip.o -c zip_.c
782
783 zip.h: headers
784 $(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c
785 $(XTCC) -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -Dlocaltime=fossil_localtime -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
786
787 $(OBJDIR)/th.o: $(SRCDIR)/th.c
788 $(XTCC) -I$(SRCDIR) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o
789
790 $(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c
791
--- src/main.mk
+++ src/main.mk
@@ -780,11 +780,11 @@
780 $(OBJDIR)/zip.o: zip_.c zip.h $(SRCDIR)/config.h
781 $(XTCC) -o $(OBJDIR)/zip.o -c zip_.c
782
783 zip.h: headers
784 $(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c
785 $(XTCC) -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
786
787 $(OBJDIR)/th.o: $(SRCDIR)/th.c
788 $(XTCC) -I$(SRCDIR) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o
789
790 $(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c
791
M src/makemake.tcl
+1
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -197,10 +197,11 @@
197197
 puts "\$(OBJDIR)/sqlite3.o:\t\$(SRCDIR)/sqlite3.c"
198198
 set opt {-DSQLITE_OMIT_LOAD_EXTENSION=1}
199199
 append opt " -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4"
200200
 #append opt " -DSQLITE_ENABLE_FTS3=1"
201201
 append opt " -Dlocaltime=fossil_localtime"
202
+append opt " -DSQLITE_ENABLE_LOCKING_STYLE=0"
202203
 puts "\t\$(XTCC) $opt -c \$(SRCDIR)/sqlite3.c -o \$(OBJDIR)/sqlite3.o\n"
203204
204205
 puts "\$(OBJDIR)/th.o:\t\$(SRCDIR)/th.c"
205206
 puts "\t\$(XTCC) -I\$(SRCDIR) -c \$(SRCDIR)/th.c -o \$(OBJDIR)/th.o\n"
206207
207208
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -197,10 +197,11 @@
197 puts "\$(OBJDIR)/sqlite3.o:\t\$(SRCDIR)/sqlite3.c"
198 set opt {-DSQLITE_OMIT_LOAD_EXTENSION=1}
199 append opt " -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4"
200 #append opt " -DSQLITE_ENABLE_FTS3=1"
201 append opt " -Dlocaltime=fossil_localtime"
 
202 puts "\t\$(XTCC) $opt -c \$(SRCDIR)/sqlite3.c -o \$(OBJDIR)/sqlite3.o\n"
203
204 puts "\$(OBJDIR)/th.o:\t\$(SRCDIR)/th.c"
205 puts "\t\$(XTCC) -I\$(SRCDIR) -c \$(SRCDIR)/th.c -o \$(OBJDIR)/th.o\n"
206
207
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -197,10 +197,11 @@
197 puts "\$(OBJDIR)/sqlite3.o:\t\$(SRCDIR)/sqlite3.c"
198 set opt {-DSQLITE_OMIT_LOAD_EXTENSION=1}
199 append opt " -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4"
200 #append opt " -DSQLITE_ENABLE_FTS3=1"
201 append opt " -Dlocaltime=fossil_localtime"
202 append opt " -DSQLITE_ENABLE_LOCKING_STYLE=0"
203 puts "\t\$(XTCC) $opt -c \$(SRCDIR)/sqlite3.c -o \$(OBJDIR)/sqlite3.o\n"
204
205 puts "\$(OBJDIR)/th.o:\t\$(SRCDIR)/th.c"
206 puts "\t\$(XTCC) -I\$(SRCDIR) -c \$(SRCDIR)/th.c -o \$(OBJDIR)/th.o\n"
207
208
M src/sqlite3.c
+3 -6
--- src/sqlite3.c
+++ src/sqlite3.c
@@ -628,11 +628,11 @@
628628
 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
629629
 ** [sqlite_version()] and [sqlite_source_id()].
630630
 */
631631
 #define SQLITE_VERSION "3.6.23"
632632
 #define SQLITE_VERSION_NUMBER 3006023
633
-#define SQLITE_SOURCE_ID "2010-03-04 22:36:45 1a0fa8d19d69d4ecaaaa879ac3c893980375fcc6"
633
+#define SQLITE_SOURCE_ID "2010-03-04 17:58:45 5e472896e02eed05c6c0886a48acd0bdc7a38731"
634634
635635
 /*
636636
 ** CAPI3REF: Run-Time Library Version Numbers
637637
 ** KEYWORDS: sqlite3_version, sqlite3_sourceid
638638
 **
@@ -21476,11 +21476,11 @@
2147621476
 ** selection of the appropriate locking style based on the filesystem
2147721477
 ** where the database is located.
2147821478
 */
2147921479
 #if !defined(SQLITE_ENABLE_LOCKING_STYLE)
2148021480
 # if defined(__APPLE__)
21481
-# define SQLITE_ENABLE_LOCKING_STYLE 0
21481
+# define SQLITE_ENABLE_LOCKING_STYLE 1
2148221482
 # else
2148321483
 # define SQLITE_ENABLE_LOCKING_STYLE 0
2148421484
 # endif
2148521485
 #endif
2148621486
@@ -21542,13 +21542,10 @@
2154221542
 # include <sys/param.h>
2154321543
 # include <sys/mount.h>
2154421544
 # endif
2154521545
 #endif /* SQLITE_ENABLE_LOCKING_STYLE */
2154621546
21547
-#ifdef __APPLE__
21548
-#endif
21549
-
2155021547
 /*
2155121548
 ** Allowed values of unixFile.fsFlags
2155221549
 */
2155321550
 #define SQLITE_FSFLAGS_IS_MSDOS 0x1
2155421551
@@ -26524,11 +26521,11 @@
2652426521
 sqlite3_free(pNew);
2652526522
 sqlite3_free(pUnused);
2652626523
 return rc;
2652726524
 }
2652826525
26529
-#if defined(SQLITE_TEST) && defined(__APPLE__) && SQLITE_ENABLE_LOCKING_STYLE
26526
+#ifdef SQLITE_TEST
2653026527
 /* simulate multiple hosts by creating unique hostid file paths */
2653126528
 SQLITE_API int sqlite3_hostid_num = 0;
2653226529
 #endif
2653326530
2653426531
 #define PROXY_HOSTIDLEN 16 /* conch file host id length */
2653526532
--- src/sqlite3.c
+++ src/sqlite3.c
@@ -628,11 +628,11 @@
628 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
629 ** [sqlite_version()] and [sqlite_source_id()].
630 */
631 #define SQLITE_VERSION "3.6.23"
632 #define SQLITE_VERSION_NUMBER 3006023
633 #define SQLITE_SOURCE_ID "2010-03-04 22:36:45 1a0fa8d19d69d4ecaaaa879ac3c893980375fcc6"
634
635 /*
636 ** CAPI3REF: Run-Time Library Version Numbers
637 ** KEYWORDS: sqlite3_version, sqlite3_sourceid
638 **
@@ -21476,11 +21476,11 @@
21476 ** selection of the appropriate locking style based on the filesystem
21477 ** where the database is located.
21478 */
21479 #if !defined(SQLITE_ENABLE_LOCKING_STYLE)
21480 # if defined(__APPLE__)
21481 # define SQLITE_ENABLE_LOCKING_STYLE 0
21482 # else
21483 # define SQLITE_ENABLE_LOCKING_STYLE 0
21484 # endif
21485 #endif
21486
@@ -21542,13 +21542,10 @@
21542 # include <sys/param.h>
21543 # include <sys/mount.h>
21544 # endif
21545 #endif /* SQLITE_ENABLE_LOCKING_STYLE */
21546
21547 #ifdef __APPLE__
21548 #endif
21549
21550 /*
21551 ** Allowed values of unixFile.fsFlags
21552 */
21553 #define SQLITE_FSFLAGS_IS_MSDOS 0x1
21554
@@ -26524,11 +26521,11 @@
26524 sqlite3_free(pNew);
26525 sqlite3_free(pUnused);
26526 return rc;
26527 }
26528
26529 #if defined(SQLITE_TEST) && defined(__APPLE__) && SQLITE_ENABLE_LOCKING_STYLE
26530 /* simulate multiple hosts by creating unique hostid file paths */
26531 SQLITE_API int sqlite3_hostid_num = 0;
26532 #endif
26533
26534 #define PROXY_HOSTIDLEN 16 /* conch file host id length */
26535
--- src/sqlite3.c
+++ src/sqlite3.c
@@ -628,11 +628,11 @@
628 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
629 ** [sqlite_version()] and [sqlite_source_id()].
630 */
631 #define SQLITE_VERSION "3.6.23"
632 #define SQLITE_VERSION_NUMBER 3006023
633 #define SQLITE_SOURCE_ID "2010-03-04 17:58:45 5e472896e02eed05c6c0886a48acd0bdc7a38731"
634
635 /*
636 ** CAPI3REF: Run-Time Library Version Numbers
637 ** KEYWORDS: sqlite3_version, sqlite3_sourceid
638 **
@@ -21476,11 +21476,11 @@
21476 ** selection of the appropriate locking style based on the filesystem
21477 ** where the database is located.
21478 */
21479 #if !defined(SQLITE_ENABLE_LOCKING_STYLE)
21480 # if defined(__APPLE__)
21481 # define SQLITE_ENABLE_LOCKING_STYLE 1
21482 # else
21483 # define SQLITE_ENABLE_LOCKING_STYLE 0
21484 # endif
21485 #endif
21486
@@ -21542,13 +21542,10 @@
21542 # include <sys/param.h>
21543 # include <sys/mount.h>
21544 # endif
21545 #endif /* SQLITE_ENABLE_LOCKING_STYLE */
21546
 
 
 
21547 /*
21548 ** Allowed values of unixFile.fsFlags
21549 */
21550 #define SQLITE_FSFLAGS_IS_MSDOS 0x1
21551
@@ -26524,11 +26521,11 @@
26521 sqlite3_free(pNew);
26522 sqlite3_free(pUnused);
26523 return rc;
26524 }
26525
26526 #ifdef SQLITE_TEST
26527 /* simulate multiple hosts by creating unique hostid file paths */
26528 SQLITE_API int sqlite3_hostid_num = 0;
26529 #endif
26530
26531 #define PROXY_HOSTIDLEN 16 /* conch file host id length */
26532
M src/sqlite3.h
+1 -1
--- src/sqlite3.h
+++ src/sqlite3.h
@@ -107,11 +107,11 @@
107107
 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
108108
 ** [sqlite_version()] and [sqlite_source_id()].
109109
 */
110110
 #define SQLITE_VERSION "3.6.23"
111111
 #define SQLITE_VERSION_NUMBER 3006023
112
-#define SQLITE_SOURCE_ID "2010-03-04 22:36:45 1a0fa8d19d69d4ecaaaa879ac3c893980375fcc6"
112
+#define SQLITE_SOURCE_ID "2010-03-04 17:58:45 5e472896e02eed05c6c0886a48acd0bdc7a38731"
113113
114114
 /*
115115
 ** CAPI3REF: Run-Time Library Version Numbers
116116
 ** KEYWORDS: sqlite3_version, sqlite3_sourceid
117117
 **
118118
--- src/sqlite3.h
+++ src/sqlite3.h
@@ -107,11 +107,11 @@
107 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
108 ** [sqlite_version()] and [sqlite_source_id()].
109 */
110 #define SQLITE_VERSION "3.6.23"
111 #define SQLITE_VERSION_NUMBER 3006023
112 #define SQLITE_SOURCE_ID "2010-03-04 22:36:45 1a0fa8d19d69d4ecaaaa879ac3c893980375fcc6"
113
114 /*
115 ** CAPI3REF: Run-Time Library Version Numbers
116 ** KEYWORDS: sqlite3_version, sqlite3_sourceid
117 **
118
--- src/sqlite3.h
+++ src/sqlite3.h
@@ -107,11 +107,11 @@
107 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
108 ** [sqlite_version()] and [sqlite_source_id()].
109 */
110 #define SQLITE_VERSION "3.6.23"
111 #define SQLITE_VERSION_NUMBER 3006023
112 #define SQLITE_SOURCE_ID "2010-03-04 17:58:45 5e472896e02eed05c6c0886a48acd0bdc7a38731"
113
114 /*
115 ** CAPI3REF: Run-Time Library Version Numbers
116 ** KEYWORDS: sqlite3_version, sqlite3_sourceid
117 **
118

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button