10000 Merge branch 'sqlite-release' into release-merge · PHPDOTSQL/sqlcipher@eb9b657 · GitHub
[go: up one dir, main page]
Skip to content

Commit eb9b657

Browse files
sjlombardosjlombardo
committed
Merge branch 'sqlite-release' into release-merge
2 parents cdfd2a3 + d09051a commit eb9b657

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

126 files changed

+11143
-4268
lines changed

‎Makefile.in

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ TCC = @CC@ @CPPFLAGS@ @CFLAGS@ -I. -I${TOP}/src -I${TOP}/ext/rtree
3232
# Define this for the autoconf-based build, so that the code knows it can
3333
# include the generated config.h
3434
#
35-
TCC += -D_HAVE_SQLITE_CONFIG_H
35+
TCC += -D_HAVE_SQLITE_CONFIG_H -DBUILD_sqlite
3636

3737
# Define -DNDEBUG to compile without debugging (i.e., for production usage)
3838
# Omitting the define will cause extra debugging code to be inserted and
@@ -531,6 +531,12 @@ sqlite3$(TEXE): $(TOP)/src/shell.c libsqlite3.la sqlite3.h
531531
sqlite3.c: .target_source $(TOP)/tool/mksqlite3c.tcl
532532
$(TCLSH_CMD) $(TOP)/tool/mksqlite3c.tcl
533533

534+
tclsqlite3.c: sqlite3.c
535+
echo '#ifndef USE_SYSTEM_SQLITE' >tclsqlite3.c
536+
cat sqlite3.c >>tclsqlite3.c
537+
echo '#endif /* USE_SYSTEM_SQLITE */' >>tclsqlite3.c
538+
cat $(TOP)/src/tclsqlite.c >>tclsqlite3.c
539+
534540
sqlite3-all.c: sqlite3.c $(TOP)/tool/split-sqlite3c.tcl
535541
$(TCLSH_CMD) $(TOP)/tool/split-sqlite3c.tcl
536542

‎VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.7.9
1+
3.7.10

‎config.h.in

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@
3333
/* Define to 1 if you have the `localtime_s' function. */
3434
#undef HAVE_LOCALTIME_S
3535

36+
/* Define to 1 if you have the `malloc_usable_size' function. */
37+
#undef HAVE_MALLOC_USABLE_SIZE
38+
3639
/* Define to 1 if you have the <memory.h> header file. */
3740
#undef HAVE_MEMORY_H
3841

0 commit comments

Comments
 (0)
0