Skip to content

Commit 92bc322

Browse files
sjlombardosjlombardo
committed
track 3.7.2
1 parent 953ca18 commit 92bc322

Some content is hidden

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

116 files changed

+7383
-1875
lines changed

‎Makefile.arm-wince-mingw32ce-gcc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -103,15 +103,15 @@ SHPREFIX =
103103
#
104104
#TCL_FLAGS =
105105
#TCL_FLAGS = -DSTATIC_BUILD=1
106-
TCL_FLAGS = -I/home/drh/tcltk/8.4linux
107-
#TCL_FLAGS = -I/home/drh/tcltk/8.4win -DSTATIC_BUILD=1
106+
TCL_FLAGS = -I/home/drh/tcltk/8.5linux
107+
#TCL_FLAGS = -I/home/drh/tcltk/8.5win -DSTATIC_BUILD=1
108108
#TCL_FLAGS = -I/home/drh/tcltk/8.3hpux
109109

110110
#### Linker options needed to link against the TCL library.
111111
#
112112
#LIBTCL = -ltcl -lm -ldl
113-
LIBTCL = /home/drh/tcltk/8.4linux/libtcl8.4g.a -lm -ldl
114-
#LIBTCL = /home/drh/tcltk/8.4win/libtcl84s.a -lmsvcrt
113+
LIBTCL = /home/drh/tcltk/8.5linux/libtcl8.5g.a -lm -ldl
114+
#LIBTCL = /home/drh/tcltk/8.5win/libtcl85s.a -lmsvcrt
115115
#LIBTCL = /home/drh/tcltk/8.3hpux/libtcl8.3.a -ldld -lm -lc
116116

117117
#### Additional objects for SQLite library when TCL support is enabled.

‎Makefile.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -748,7 +748,7 @@ tclsqlite-shell.lo: $(TOP)/src/tclsqlite.c $(HDR)
748748
$(LTCOMPILE) -DTCLSH=1 -o $@ -c $(TOP)/src/tclsqlite.c
749749

750750
tclsqlite-stubs.lo: $(TOP)/src/tclsqlite.c $(HDR)
751-
$(LTCOMPILE) -DTCL_USE_STUBS=1 -o $@ -c $(TOP)/src/tclsqlite.c
751+
$(LTCOMPILE) -DUSE_TCL_STUBS=1 -o $@ -c $(TOP)/src/tclsqlite.c
752752

753753
tclsqlite3$(TEXE): tclsqlite-shell.lo libsqlite3.la
754754
$(LTLINK) -o $@ tclsqlite-shell.lo \

‎Makefile.linux-gcc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,15 +93,15 @@ SHPREFIX = lib
9393
#
9494
#TCL_FLAGS =
9595
#TCL_FLAGS = -DSTATIC_BUILD=1
96-
TCL_FLAGS = -I/home/drh/tcltk/8.4linux
97-
#TCL_FLAGS = -I/home/drh/tcltk/8.4win -DSTATIC_BUILD=1
96+
TCL_FLAGS = -I/home/drh/tcltk/8.5linux
97+
#TCL_FLAGS = -I/home/drh/tcltk/8.5win -DSTATIC_BUILD=1
9898
#TCL_FLAGS = -I/home/drh/tcltk/8.3hpux
9999

100100
#### Linker options needed to link against the TCL library.
101101
#
102102
#LIBTCL = -ltcl -lm -ldl
103-
LIBTCL = /home/drh/tcltk/8.4linux/libtcl8.4g.a -lm -ldl
104-
#LIBTCL = /home/drh/tcltk/8.4win/libtcl84s.a -lmsvcrt
103+
LIBTCL = /home/drh/tcltk/8.5linux/libtcl8.5g.a -lm -ldl
104+
#LIBTCL = /home/drh/tcltk/8.5win/libtcl85s.a -lmsvcrt
105105
#LIBTCL = /home/drh/tcltk/8.3hpux/libtcl8.3.a -ldld -lm -lc
106106

107107
#### Additional objects for SQLite library when TCL support is enabled.

‎Makefile.vxworks‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -110,15 +110,15 @@ SHPREFIX = lib
110110
#
111111
#TCL_FLAGS =
112112
#TCL_FLAGS = -DSTATIC_BUILD=1
113-
TCL_FLAGS = -I/home/drh/tcltk/8.4linux
114-
#TCL_FLAGS = -I/home/drh/tcltk/8.4win -DSTATIC_BUILD=1
113+
TCL_FLAGS = -I/home/drh/tcltk/8.5linux
114+
#TCL_FLAGS = -I/home/drh/tcltk/8.5win -DSTATIC_BUILD=1
115115
#TCL_FLAGS = -I/home/drh/tcltk/8.3hpux
116116

117117
#### Linker options needed to link against the TCL library.
118118
#
119119
#LIBTCL = -ltcl -lm -ldl
120-
LIBTCL = /home/drh/tcltk/8.4linux/libtcl8.4g.a -lm -ldl
121-
#LIBTCL = /home/drh/tcltk/8.4win/libtcl84s.a -lmsvcrt
120+
LIBTCL = /home/drh/tcltk/8.5linux/libtcl8.5g.a -lm -ldl
121+
#LIBTCL = /home/drh/tcltk/8.5win/libtcl85s.a -lmsvcrt
122122
#LIBTCL = /home/drh/tcltk/8.3hpux/libtcl8.3.a -ldld -lm -lc
123123

124124
#### Additional objects for SQLite library when TCL support is enabled.

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.7.0.1
1+
3.7.2

‎configure‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#! /bin/sh
22
# Guess values for system-dependent variables and create Makefiles.
3-
# Generated by GNU Autoconf 2.62 for sqlite 3.7.0.1.
3+
# Generated by GNU Autoconf 2.62 for sqlite 3.7.2.
44
#
55
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
66
# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
@@ -743,8 +743,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
743743
# Identity of this package.
744744
PACKAGE_NAME='sqlite'
745745
PACKAGE_TARNAME='sqlite'
746-
PACKAGE_VERSION='3.7.0.1'
747-
PACKAGE_STRING='sqlite 3.7.0.1'
746+
PACKAGE_VERSION='3.7.2'
747+
PACKAGE_STRING='sqlite 3.7.2'
748748
PACKAGE_BUGREPORT=''
749749

750750
# Factoring default headers for most tests.
@@ -1487,7 +1487,7 @@ if test "$ac_init_help" = "long"; then
14871487
# Omit some internal or obsolete options to make the list less imposing.
14881488
# This message is too long to be a string in the A/UX 3.1 sh.
14891489
cat <<_ACEOF
1490-
\`configure' configures sqlite 3.7.0.1 to adapt to many kinds of systems.
1490+
\`configure' configures sqlite 3.7.2 to adapt to many kinds of systems.
14911491
14921492
Usage: $0 [OPTION]... [VAR=VALUE]...
14931493
@@ -1552,7 +1552,7 @@ fi
15521552

15531553
if test -n "$ac_init_help"; then
15541554
case $ac_init_help in
1555-
short | recursive ) echo "Configuration of sqlite 3.7.0.1:";;
1555+
short | recursive ) echo "Configuration of sqlite 3.7.2:";;
15561556
esac
15571557
cat <<\_ACEOF
15581558
@@ -1670,7 +1670,7 @@ fi
16701670
test -n "$ac_init_help" && exit $ac_status
16711671
if $ac_init_version; then
16721672
cat <<\_ACEOF
1673-
sqlite configure 3.7.0.1
1673+
sqlite configure 3.7.2
16741674
generated by GNU Autoconf 2.62
16751675
16761676
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1684,7 +1684,7 @@ cat >config.log <<_ACEOF
16841684
This file contains any messages produced by compilers while
16851685
running configure, to aid debugging if configure makes a mistake.
16861686
1687-
It was created by sqlite $as_me 3.7.0.1, which was
1687+
It was created by sqlite $as_me 3.7.2, which was
16881688
generated by GNU Autoconf 2.62. Invocation command line was
16891689
16901690
$ $0 $@
@@ -12259,7 +12259,7 @@ USE_AMALGAMATION=1
1225912259
# if not, then we fall back to plain tclsh.
1226012260
# TODO: try other versions before falling back?
1226112261
#
12262-
for ac_prog in tclsh8.4 tclsh
12262+
for ac_prog in tclsh8.5 tclsh
1226312263
do
1226412264
# Extract the first word of "$ac_prog", so it can be a program name with args.
1226512265
set dummy $ac_prog; ac_word=$2
@@ -13972,7 +13972,7 @@ exec 6>&1
1397213972
# report actual input values of CONFIG_FILES etc. instead of their
1397313973
# values after options handling.
1397413974
ac_log="
13975-
This file was extended by sqlite $as_me 3.7.0.1, which was
13975+
This file was extended by sqlite $as_me 3.7.2, which was
1397613976
generated by GNU Autoconf 2.62. Invocation command line was
1397713977
1397813978
CONFIG_FILES = $CONFIG_FILES
@@ -14025,7 +14025,7 @@ Report bugs to <bug-autoconf@gnu.org>."
1402514025
_ACEOF
1402614026
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
1402714027
ac_cs_version="\\
14028-
sqlite config.status 3.7.0.1
14028+
sqlite config.status 3.7.2
1402914029
configured by $0, generated by GNU Autoconf 2.62,
1403014030
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
1403114031

‎configure.ac‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ USE_AMALGAMATION=1
139139
# if not, then we fall back to plain tclsh.
140140
# TODO: try other versions before falling back?
141141
#
142-
AC_CHECK_PROGS(TCLSH_CMD, [tclsh8.4 tclsh], none)
142+
AC_CHECK_PROGS(TCLSH_CMD, [tclsh8.5 tclsh], none)
143143
if test "$TCLSH_CMD" = "none"; then
144144
# If we can't find a local tclsh, then building the amalgamation will fail.
145145
# We act as though --disable-amalgamation has been used.

‎ext/fts3/fts3.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2653,7 +2653,7 @@ static void hashDestroy(void *p){
26532653
** used to retrieve the respective implementations.
26542654
**
26552655
** Calling sqlite3Fts3SimpleTokenizerModule() sets the value pointed
2656-
** to by the argument to point a the "simple" tokenizer implementation.
2656+
** to by the argument to point to the "simple" tokenizer implementation.
26572657
** Function ...PorterTokenizerModule() sets *pModule to point to the
26582658
** porter tokenizer/stemmer implementation.
26592659
*/

‎ext/fts3/fts3_expr.c‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@ int sqlite3_fts3_enable_parentheses = 0;
7878
#define SQLITE_FTS3_DEFAULT_NEAR_PARAM 10
7979

8080
#include "fts3Int.h"
81-
#include <ctype.h>
8281
#include <string.h>
8382
#include <assert.h>
8483

@@ -104,7 +103,7 @@ struct ParseContext {
104103
** negative values).
105104
*/
106105
static int fts3isspace(char c){
107-
return (c&0x80)==0 ? isspace(c) : 0;
106+
return c==' ' || c=='\t' || c=='\n' || c=='\r' || c=='\v' || c=='\f';
108107
}
109108

110109
/*

‎ext/fts3/fts3_porter.c‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
#include <stdlib.h>
3131
#include <stdio.h>
3232
#include <string.h>
33-
#include <ctype.h>
3433

3534
#include "fts3_tokenizer.h"
3635

0 commit comments

Comments
 (0)