Revert the SQLITE_APICALL changes for now. That changes needs further

research before it is released.  Deferred until 3.15.

FossilOrigin-Name: 9adda385267d1a0ecff259b42a284913668441a2

diff --git a/Makefile.msc b/Makefile.msc
index 5f7643978c0a7858f4a60ec87403f9a20263b6c1..cd866ce4a4ec7827b148f8b83a6fa484a11af9a7 100644 (file)
--- a/Makefile.msc
+++ b/Makefile.msc
@@ -24,13 +24,6 @@ USE_AMALGAMATION = 1
 USE_FULLWARN = 0
 !ENDIF
 
-# Set this non-0 to enable full runtime error checks (-RTC1, etc).  This
-# has no effect if (any) optimizations are enabled.
-#
-!IFNDEF USE_RUNTIME_CHECKS
-USE_RUNTIME_CHECKS = 0
-!ENDIF
-
 # Set this non-0 to use "stdcall" calling convention for the core library
 # and shell executable.
 #
@@ -471,32 +464,20 @@ RCC = $(RC) -DSQLITE_OS_WIN=1 -I. -I$(TOP) -I$(TOP)\src $(RCOPTS) $(RCCOPTS)
 #
 !IF $(USE_STDCALL)!=0 || $(FOR_WIN10)!=0
 !IF "$(PLATFORM)"=="x86"
-CORE_CCONV_OPTS = -Gz -DSQLITE_CDECL=__cdecl -DSQLITE_APICALL=__stdcall -DSQLITE_CALLBACK=__stdcall -DSQLITE_SYSAPI=__stdcall
-SHELL_CCONV_OPTS = -Gz -DSQLITE_CDECL=__cdecl -DSQLITE_APICALL=__stdcall -DSQLITE_CALLBACK=__stdcall -DSQLITE_SYSAPI=__stdcall
-# <<mark>>
-TEST_CCONV_OPTS = -Gz -DSQLITE_CDECL=__cdecl -DSQLITE_APICALL=__stdcall -DSQLITE_CALLBACK=__stdcall -DSQLITE_SYSAPI=__stdcall -DINCLUDE_SQLITE_TCL_H=1 -DSQLITE_TCLAPI=__cdecl
-# <</mark>>
+CORE_CCONV_OPTS = -Gz -DSQLITE_CDECL=__cdecl -DSQLITE_STDCALL=__stdcall
+SHELL_CCONV_OPTS = -Gz -DSQLITE_CDECL=__cdecl -DSQLITE_STDCALL=__stdcall
 !ELSE
 !IFNDEF PLATFORM
-CORE_CCONV_OPTS = -Gz -DSQLITE_CDECL=__cdecl -DSQLITE_APICALL=__stdcall -DSQLITE_CALLBACK=__stdcall -DSQLITE_SYSAPI=__stdcall
-SHELL_CCONV_OPTS = -Gz -DSQLITE_CDECL=__cdecl -DSQLITE_APICALL=__stdcall -DSQLITE_CALLBACK=__stdcall -DSQLITE_SYSAPI=__stdcall
-# <<mark>>
-TEST_CCONV_OPTS = -Gz -DSQLITE_CDECL=__cdecl -DSQLITE_APICALL=__stdcall -DSQLITE_CALLBACK=__stdcall -DSQLITE_SYSAPI=__stdcall -DINCLUDE_SQLITE_TCL_H=1 -DSQLITE_TCLAPI=__cdecl
-# <</mark>>
+CORE_CCONV_OPTS = -Gz -DSQLITE_CDECL=__cdecl -DSQLITE_STDCALL=__stdcall
+SHELL_CCONV_OPTS = -Gz -DSQLITE_CDECL=__cdecl -DSQLITE_STDCALL=__stdcall
 !ELSE
 CORE_CCONV_OPTS =
 SHELL_CCONV_OPTS =
-# <<mark>>
-TEST_CCONV_OPTS =
-# <</mark>>
 !ENDIF
 !ENDIF
 !ELSE
 CORE_CCONV_OPTS =
 SHELL_CCONV_OPTS =
-# <<mark>>
-TEST_CCONV_OPTS =
-# <</mark>>
 !ENDIF
 
 # These are additional compiler options used for the core library.
@@ -854,10 +835,6 @@ RCC = $(RCC) -D_DEBUG
 !IF $(DEBUG)>1 || $(OPTIMIZATIONS)==0
 TCC = $(TCC) -Od
 BCC = $(BCC) -Od
-!IF $(USE_RUNTIME_CHECKS)!=0
-TCC = $(TCC) -RTC1
-BCC = $(BCC) -RTC1
-!ENDIF
 !ELSEIF $(OPTIMIZATIONS)>=3
 TCC = $(TCC) -Ox
 BCC = $(BCC) -Ox
@@ -1258,12 +1235,6 @@ SRC11 = \
   parse.h \
   $(SQLITE3H)
 
-# Generated Tcl header files
-#
-SRC12 = \
-  sqlite_tcl.h \
-  sqlite_tclDecls.h
-
 # All source code files.
 #
 SRC = $(SRC00) $(SRC01) $(SRC02) $(SRC03) $(SRC04) $(SRC05) $(SRC06) $(SRC07) $(SRC08) $(SRC09) $(SRC10) $(SRC11)
@@ -1370,7 +1341,7 @@ HDR = \
    parse.h \
    $(TOP)\src\pragma.h \
    $(SQLITE3H) \
-   sqlite3ext.h \
+   $(TOP)\src\sqlite3ext.h \
    $(TOP)\src\sqliteInt.h \
    $(TOP)\src\sqliteLimit.h \
    $(TOP)\src\vdbe.h \
@@ -1424,10 +1395,7 @@ FUZZDATA = \
 # when the shell is not being dynamically linked.
 #
 !IF $(DYNAMIC_SHELL)==0 && $(FOR_WIN10)==0
-SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_SHELL_JSON1 -DSQLITE_ENABLE_FTS4
-# SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_ENABLE_FTS5
-SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_ENABLE_EXPLAIN_COMMENTS
-SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_ENABLE_UNKNOWN_SQL_FUNCTION
+SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_SHELL_JSON1 -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_EXPLAIN_COMMENTS
 !ENDIF
 
 # <<mark>>
@@ -1531,7 +1499,7 @@ mptest:   mptester.exe
 # files are automatically generated.  This target takes care of
 # all that automatic generation.
 #
-.target_source:        $(SRC) $(TOP)\tool\vdbe-compress.tcl fts5.c sqlite_tcl.h
+.target_source:        $(SRC) $(TOP)\tool\vdbe-compress.tcl fts5.c
        -rmdir /Q/S tsrc 2>NUL
        -mkdir tsrc
        for %i in ($(SRC00)) do copy /Y %i tsrc
@@ -1546,7 +1514,6 @@ mptest:   mptester.exe
        for %i in ($(SRC09)) do copy /Y %i tsrc
        for %i in ($(SRC10)) do copy /Y %i tsrc
        for %i in ($(SRC11)) do copy /Y %i tsrc
-       for %i in ($(SRC12)) do copy /Y %i tsrc
        copy /Y fts5.c tsrc
        copy /Y fts5.h tsrc
        del /Q tsrc\sqlite.h.in tsrc\parse.y 2>NUL
@@ -1828,10 +1795,10 @@ wherecode.lo:   $(TOP)\src\wherecode.c $(HDR)
 whereexpr.lo:  $(TOP)\src\whereexpr.c $(HDR)
        $(LTCOMPILE) $(CORE_COMPILE_OPTS) -c $(TOP)\src\whereexpr.c
 
-tclsqlite.lo:  $(TOP)\src\tclsqlite.c $(HDR) sqlite_tcl.h
+tclsqlite.lo:  $(TOP)\src\tclsqlite.c $(HDR)
        $(LTCOMPILE) $(NO_WARN) -DUSE_TCL_STUBS=1 -DBUILD_sqlite -I$(TCLINCDIR) -c $(TOP)\src\tclsqlite.c
 
-tclsqlite-shell.lo:    $(TOP)\src\tclsqlite.c $(HDR) sqlite_tcl.h
+tclsqlite-shell.lo:    $(TOP)\src\tclsqlite.c $(HDR)
        $(LTCOMPILE) $(NO_WARN) -DTCLSH=1 -DBUILD_sqlite -I$(TCLINCDIR) -c $(TOP)\src\tclsqlite.c
 
 tclsqlite3.exe:        tclsqlite-shell.lo $(SQLITE3C) $(SQLITE3H) $(LIBRESOBJS)
@@ -1860,9 +1827,7 @@ $(SQLITE3H):      $(TOP)\src\sqlite.h.in $(TOP)\manifest.uuid $(TOP)\VERSION
        $(TCLSH_CMD) $(TOP)\tool\mksqlite3h.tcl $(TOP:\=/) > $(SQLITE3H)
 
 sqlite3ext.h:  .target_source
-       type tsrc\sqlite3ext.h | $(TCLSH_CMD) $(TOP)\tool\replace.tcl regsub "\(\*\)" "(SQLITE_CALLBACK *)" \
-               | $(TCLSH_CMD) $(TOP)\tool\replace.tcl regsub "\(\*" "(SQLITE_APICALL *" > sqlite3ext.h
-       copy /Y sqlite3ext.h tsrc\sqlite3ext.h
+       copy tsrc\sqlite3ext.h .
 
 mkkeywordhash.exe:     $(TOP)\tool\mkkeywordhash.c
        $(BCC) $(NO_WARN) -Fe$@ $(REQ_FEATURE_FLAGS) $(OPT_FEATURE_FLAGS) $(EXT_FEATURE_FLAGS) $(OPTS) \
@@ -1995,7 +1960,6 @@ TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_SERVER=1 -DSQLITE_PRIVATE=""
 TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_CORE $(NO_WARN)
 TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_SERIES_CONSTRAINT_VERIFY=1
 TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_DEFAULT_PAGE_SIZE=1024
-TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) $(TEST_CCONV_OPTS)
 
 TESTFIXTURE_SRC0 = $(TESTEXT) $(TESTSRC2)
 TESTFIXTURE_SRC1 = $(TESTEXT) $(SQLITE3C)
@@ -2005,25 +1969,7 @@ TESTFIXTURE_SRC = $(TESTSRC) $(TOP)\src\tclsqlite.c $(TESTFIXTURE_SRC0)
 TESTFIXTURE_SRC = $(TESTSRC) $(TOP)\src\tclsqlite.c $(TESTFIXTURE_SRC1)
 !ENDIF
 
-sqlite_tclDecls.h:
-       echo #ifndef SQLITE_TCLAPI > sqlite_tclDecls.h
-       echo #  define SQLITE_TCLAPI >> sqlite_tclDecls.h
-       echo #endif >> sqlite_tclDecls.h
-       type "$(TCLINCDIR)\tclDecls.h" \
-               | $(TCLSH_CMD) $(TOP)\tool\replace.tcl regsub "^(EXTERN(?: CONST\d+?)?\s+?[^\(]*?\s+?)Tcl_" "\1 SQLITE_TCLAPI Tcl_" \
-               | $(TCLSH_CMD) $(TOP)\tool\replace.tcl regsub "^(EXTERN\s+?(?:void|VOID)\s+?)TclFreeObj" "\1 SQLITE_TCLAPI TclFreeObj" \
-               | $(TCLSH_CMD) $(TOP)\tool\replace.tcl regsub "\(\*tcl_" "(SQLITE_TCLAPI *tcl_" \
-               | $(TCLSH_CMD) $(TOP)\tool\replace.tcl regsub "\(\*tclFreeObj" "(SQLITE_TCLAPI *tclFreeObj" \
-               | $(TCLSH_CMD) $(TOP)\tool\replace.tcl regsub "\(\*" "(SQLITE_TCLAPI *" >> sqlite_tclDecls.h
-
-sqlite_tcl.h:  sqlite_tclDecls.h
-       type "$(TCLINCDIR)\tcl.h" | $(TCLSH_CMD) $(TOP)\tool\replace.tcl exact tclDecls.h sqlite_tclDecls.h \
-               | $(TCLSH_CMD) $(TOP)\tool\replace.tcl regsub "typedef (.*?)\(Tcl_" "typedef \1 (SQLITE_TCLAPI Tcl_" \
-               | $(TCLSH_CMD) $(TOP)\tool\replace.tcl exact "void (*freeProc)" "void (SQLITE_TCLAPI *freeProc)" \
-               | $(TCLSH_CMD) $(TOP)\tool\replace.tcl exact "Tcl_HashEntry *(*findProc)" "Tcl_HashEntry *(SQLITE_TCLAPI *findProc)" \
-               | $(TCLSH_CMD) $(TOP)\tool\replace.tcl exact "Tcl_HashEntry *(*createProc)" "Tcl_HashEntry *(SQLITE_TCLAPI *createProc)" >> sqlite_tcl.h
-
-testfixture.exe:       $(TESTFIXTURE_SRC) $(SQLITE3H) $(LIBRESOBJS) $(HDR) sqlite_tcl.h
+testfixture.exe:       $(TESTFIXTURE_SRC) $(SQLITE3H) $(LIBRESOBJS) $(HDR)
        $(LTLINK) -DSQLITE_NO_SYNC=1 $(TESTFIXTURE_FLAGS) \
                -DBUILD_sqlite -I$(TCLINCDIR) \
                $(TESTFIXTURE_SRC) \
@@ -2072,7 +2018,7 @@ smoketest:        $(TESTPROGS)
        @set PATH=$(LIBTCLPATH);$(PATH)
        .\testfixture.exe $(TOP)\test\main.test $(TESTOPTS)
 
-sqlite3_analyzer.c:    $(SQLITE3C) $(SQLITE3H) $(TOP)\src\tclsqlite.c $(TOP)\tool\spaceanal.tcl sqlite_tcl.h
+sqlite3_analyzer.c:    $(SQLITE3C) $(SQLITE3H) $(TOP)\src\tclsqlite.c $(TOP)\tool\spaceanal.tcl
        echo #define TCLSH 2 > $@
        echo #define SQLITE_ENABLE_DBSTAT_VTAB 1 >> $@
        copy $@ + $(SQLITE3C) + $(TOP)\src\tclsqlite.c $@
@@ -2152,7 +2098,7 @@ clean:
        -rmdir /Q/S .libs 2>NUL
        -rmdir /Q/S tsrc 2>NUL
        del /Q .target_source 2>NUL
-       del /Q tclsqlite3.exe sqlite_tcl.h sqlite_tclDecls.h 2>NUL
+       del /Q tclsqlite3.exe 2>NUL
        del /Q testloadext.dll 2>NUL
        del /Q testfixture.exe test.db 2>NUL
        del /Q LogEst.exe fts3view.exe rollback-test.exe showdb.exe 2>NUL

diff --git a/manifest b/manifest
index c4a95c5defcfa2be6db6d8b96194e97e0af77e1e..5b9bd0d8e58d3ad25cb345ffbffe05652e575122 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,8 +1,8 @@
-C Add\sthe\sexperimental\sSQLITE_ENABLE_UNKNOWN_SQL_FUNCTION\scompile-time\soption.\nWhen\senabled,\sthe\s"unknown\sfunction"\serror\sis\ssuppressed\sfor\sEXPLAIN\sand\na\sno-op\sfunction\snamed\s"unknown()"\sis\ssubstituted.\s\sThis\sfacilitiates\susing\nthe\scommand-line\sshell\sto\sanalyze\squeries\sfrom\sapplications\sthat\scontain\nmany\sapplication-defined\sfunctions\sthat\sare\snot\snormally\savailable\sto\sthe\nshell.
-D 2016-08-04T12:35:17.002
+C Revert\sthe\sSQLITE_APICALL\schanges\sfor\snow.\s\sThat\schanges\sneeds\sfurther\nresearch\sbefore\sit\sis\sreleased.\s\sDeferred\suntil\s3.15.
+D 2016-08-04T13:23:28.286
 F Makefile.in cfd8fb987cd7a6af046daa87daa146d5aad0e088
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
-F Makefile.msc 817e65faf9ad66a8d462e5b5e645be600213efb8
+F Makefile.msc d66d0395c38571aab3804f8db0fa20707ae4609a
 F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
 F VERSION cb29eb11e493dd85b3eeec4053c03949bf98478e
 F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@ -1450,8 +1450,8 @@ F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e
 F tool/mkpragmatab.tcl f0d5bb266d1d388cf86fce5ba01a891e95d72d41
 F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
 F tool/mksqlite3c-noext.tcl aa58ea3be311c81821c2cd3209f55e46b07ab656
-F tool/mksqlite3c.tcl 655181fb25f69b3524b30efd0750c43513415216
-F tool/mksqlite3h.tcl cf5cd68028e69a51ed5c76042672664201f0f756
+F tool/mksqlite3c.tcl 63af8429841f08552e6da1d93b3dee4a93ff8071
+F tool/mksqlite3h.tcl e7b106fc4f29fbc258e8ba9b88d9108332ea2ade
 F tool/mksqlite3internalh.tcl eb994013e833359137eb53a55acdad0b5ae1049b
 F tool/mkvsix.tcl 4abcaf3267171b2faadaf9b82a0dfbaa6e98f8b7
 F tool/offsets.c fe4262fdfa378e8f5499a42136d17bf3b98f6091
@@ -1509,8 +1509,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 13e3bd3de6b434b6182ef36be108d7ee0be8ca53
-Q +4ada023ca075628fdafc3bc4520239b9789cff29
-R f1859801c403afb60ddad5424514cd57
+P b7f30a9ff20d580fdaecdcf2b644d09ad6c2575e
+R 54afa4c645a3de150c21fe8a3504aa0b
 U drh
-Z 688b79edff11cfb7031a01d005983417
+Z 5a54570e253d8550ab3d18086a0dcdce

diff --git a/manifest.uuid b/manifest.uuid
index ee38509af6b4973ee8f05ea9f275bf65f87746cf..3bacaad736fd53371e3626e3b07cf3427c3b3a91 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b7f30a9ff20d580fdaecdcf2b644d09ad6c2575e
\ No newline at end of file
+9adda385267d1a0ecff259b42a284913668441a2
\ No newline at end of file

diff --git a/tool/mksqlite3c.tcl b/tool/mksqlite3c.tcl
index c5f765ed1cccf6ee941c4a55636c9e4055f89366..7e8558d2ab197669aea1982fc534c2f2d7cb7cb2 100644 (file)
--- a/tool/mksqlite3c.tcl
+++ b/tool/mksqlite3c.tcl
@@ -112,6 +112,7 @@ foreach hdr {
    pragma.h
    rtree.h
    sqlite3session.h
+   sqlite3ext.h
    sqlite3.h
    sqlite3ext.h
    sqlite3rbu.h
@@ -231,7 +232,7 @@ proc copy_file {filename} {
           if {[lsearch -exact $cdecllist $funcname] >= 0} {
             append line SQLITE_CDECL
           } else {
-            append line SQLITE_APICALL
+            append line SQLITE_STDCALL
           }
           append line " " $funcname $rest
           puts $out $line

diff --git a/tool/mksqlite3h.tcl b/tool/mksqlite3h.tcl
index 9a4e7d298577c3e4ec9f627e458386fe6189c44d..1af6d7573019dc6526bd9b6d9e108a71a0d16a6e 100644 (file)
--- a/tool/mksqlite3h.tcl
+++ b/tool/mksqlite3h.tcl
@@ -21,8 +21,6 @@
 #      formatted as an integer (e.g. "3006017").
 #   5) Replaces the string --SOURCE-ID-- with the date and time and sha1 
 #      hash of the fossil-scm manifest for the source tree.
-#   6) Adds the SQLITE_CALLBACK calling convention macro in front of all
-#      callback declarations.
 #
 # This script outputs to stdout.
 #
@@ -122,14 +120,11 @@ foreach file $filelist {
         if {[lsearch -exact $cdecllist $funcname] >= 0} {
           append line SQLITE_CDECL
         } else {
-          append line SQLITE_APICALL
+          append line SQLITE_STDCALL
         }
         append line " " $funcname $rest
       }
     }
-    set line [string map [list (*sqlite3_syscall_ptr) \
-        "(SQLITE_SYSAPI *sqlite3_syscall_ptr)"] $line]
-    regsub {\(\*} $line {(SQLITE_CALLBACK *} line
     puts $line
   }
   close $in