Fossil SCM

Eliminate unnecessary calls to sqlite3_win32_is_nt(), since fossil only runs on (win32) system were the Wide API is available

jan.nijtmans 2014-08-06 07:07 UTC trunk merge
Commit 3ba28b23a4d7626691b56debae4add06cd24d4ca
Parent f05e0025708d032…
4 files changed +1 +1 +2 -1 +2 -1
~ src/makemake.tcl ~ src/makemake.tcl ~ win/Makefile.mingw ~ win/Makefile.mingw.mistachkin
M src/makemake.tcl
+1
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -831,10 +831,11 @@
831831
832832
 set MINGW_SQLITE_OPTIONS $SQLITE_OPTIONS
833833
 lappend MINGW_SQLITE_OPTIONS -D_HAVE__MINGW_H
834834
 lappend MINGW_SQLITE_OPTIONS -DSQLITE_USE_MALLOC_H
835835
 lappend MINGW_SQLITE_OPTIONS -DSQLITE_USE_MSIZE
836
+lappend MINGW_SQLITE_OPTIONS -DSQLITE_WIN32_NO_ANSI
836837
837838
 set j " \\\n "
838839
 writeln "SQLITE_OPTIONS = [join $MINGW_SQLITE_OPTIONS $j]\n"
839840
 set j " \\\n "
840841
 writeln "SHELL_OPTIONS = [join $SHELL_WIN32_OPTIONS $j]\n"
841842
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -831,10 +831,11 @@
831
832 set MINGW_SQLITE_OPTIONS $SQLITE_OPTIONS
833 lappend MINGW_SQLITE_OPTIONS -D_HAVE__MINGW_H
834 lappend MINGW_SQLITE_OPTIONS -DSQLITE_USE_MALLOC_H
835 lappend MINGW_SQLITE_OPTIONS -DSQLITE_USE_MSIZE
 
836
837 set j " \\\n "
838 writeln "SQLITE_OPTIONS = [join $MINGW_SQLITE_OPTIONS $j]\n"
839 set j " \\\n "
840 writeln "SHELL_OPTIONS = [join $SHELL_WIN32_OPTIONS $j]\n"
841
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -831,10 +831,11 @@
831
832 set MINGW_SQLITE_OPTIONS $SQLITE_OPTIONS
833 lappend MINGW_SQLITE_OPTIONS -D_HAVE__MINGW_H
834 lappend MINGW_SQLITE_OPTIONS -DSQLITE_USE_MALLOC_H
835 lappend MINGW_SQLITE_OPTIONS -DSQLITE_USE_MSIZE
836 lappend MINGW_SQLITE_OPTIONS -DSQLITE_WIN32_NO_ANSI
837
838 set j " \\\n "
839 writeln "SQLITE_OPTIONS = [join $MINGW_SQLITE_OPTIONS $j]\n"
840 set j " \\\n "
841 writeln "SHELL_OPTIONS = [join $SHELL_WIN32_OPTIONS $j]\n"
842
M src/makemake.tcl
+1
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -831,10 +831,11 @@
831831
832832
 set MINGW_SQLITE_OPTIONS $SQLITE_OPTIONS
833833
 lappend MINGW_SQLITE_OPTIONS -D_HAVE__MINGW_H
834834
 lappend MINGW_SQLITE_OPTIONS -DSQLITE_USE_MALLOC_H
835835
 lappend MINGW_SQLITE_OPTIONS -DSQLITE_USE_MSIZE
836
+lappend MINGW_SQLITE_OPTIONS -DSQLITE_WIN32_NO_ANSI
836837
837838
 set j " \\\n "
838839
 writeln "SQLITE_OPTIONS = [join $MINGW_SQLITE_OPTIONS $j]\n"
839840
 set j " \\\n "
840841
 writeln "SHELL_OPTIONS = [join $SHELL_WIN32_OPTIONS $j]\n"
841842
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -831,10 +831,11 @@
831
832 set MINGW_SQLITE_OPTIONS $SQLITE_OPTIONS
833 lappend MINGW_SQLITE_OPTIONS -D_HAVE__MINGW_H
834 lappend MINGW_SQLITE_OPTIONS -DSQLITE_USE_MALLOC_H
835 lappend MINGW_SQLITE_OPTIONS -DSQLITE_USE_MSIZE
 
836
837 set j " \\\n "
838 writeln "SQLITE_OPTIONS = [join $MINGW_SQLITE_OPTIONS $j]\n"
839 set j " \\\n "
840 writeln "SHELL_OPTIONS = [join $SHELL_WIN32_OPTIONS $j]\n"
841
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -831,10 +831,11 @@
831
832 set MINGW_SQLITE_OPTIONS $SQLITE_OPTIONS
833 lappend MINGW_SQLITE_OPTIONS -D_HAVE__MINGW_H
834 lappend MINGW_SQLITE_OPTIONS -DSQLITE_USE_MALLOC_H
835 lappend MINGW_SQLITE_OPTIONS -DSQLITE_USE_MSIZE
836 lappend MINGW_SQLITE_OPTIONS -DSQLITE_WIN32_NO_ANSI
837
838 set j " \\\n "
839 writeln "SQLITE_OPTIONS = [join $MINGW_SQLITE_OPTIONS $j]\n"
840 set j " \\\n "
841 writeln "SHELL_OPTIONS = [join $SHELL_WIN32_OPTIONS $j]\n"
842
M win/Makefile.mingw
+2 -1
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -1774,11 +1774,12 @@
17741774
 -DSQLITE_DEFAULT_FILE_FORMAT=4 \
17751775
 -DSQLITE_OMIT_DEPRECATED \
17761776
 -DSQLITE_ENABLE_EXPLAIN_COMMENTS \
17771777
 -D_HAVE__MINGW_H \
17781778
 -DSQLITE_USE_MALLOC_H \
1779
- -DSQLITE_USE_MSIZE
1779
+ -DSQLITE_USE_MSIZE \
1780
+ -DSQLITE_WIN32_NO_ANSI
17801781
17811782
 SHELL_OPTIONS = -Dmain=sqlite3_shell \
17821783
 -DSQLITE_OMIT_LOAD_EXTENSION=1 \
17831784
 -DUSE_SYSTEM_SQLITE=$(USE_SYSTEM_SQLITE) \
17841785
 -DSQLITE_SHELL_DBNAME_PROC=fossil_open \
17851786
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -1774,11 +1774,12 @@
1774 -DSQLITE_DEFAULT_FILE_FORMAT=4 \
1775 -DSQLITE_OMIT_DEPRECATED \
1776 -DSQLITE_ENABLE_EXPLAIN_COMMENTS \
1777 -D_HAVE__MINGW_H \
1778 -DSQLITE_USE_MALLOC_H \
1779 -DSQLITE_USE_MSIZE
 
1780
1781 SHELL_OPTIONS = -Dmain=sqlite3_shell \
1782 -DSQLITE_OMIT_LOAD_EXTENSION=1 \
1783 -DUSE_SYSTEM_SQLITE=$(USE_SYSTEM_SQLITE) \
1784 -DSQLITE_SHELL_DBNAME_PROC=fossil_open \
1785
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -1774,11 +1774,12 @@
1774 -DSQLITE_DEFAULT_FILE_FORMAT=4 \
1775 -DSQLITE_OMIT_DEPRECATED \
1776 -DSQLITE_ENABLE_EXPLAIN_COMMENTS \
1777 -D_HAVE__MINGW_H \
1778 -DSQLITE_USE_MALLOC_H \
1779 -DSQLITE_USE_MSIZE \
1780 -DSQLITE_WIN32_NO_ANSI
1781
1782 SHELL_OPTIONS = -Dmain=sqlite3_shell \
1783 -DSQLITE_OMIT_LOAD_EXTENSION=1 \
1784 -DUSE_SYSTEM_SQLITE=$(USE_SYSTEM_SQLITE) \
1785 -DSQLITE_SHELL_DBNAME_PROC=fossil_open \
1786
M win/Makefile.mingw.mistachkin
+2 -1
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -1774,11 +1774,12 @@
17741774
 -DSQLITE_DEFAULT_FILE_FORMAT=4 \
17751775
 -DSQLITE_OMIT_DEPRECATED \
17761776
 -DSQLITE_ENABLE_EXPLAIN_COMMENTS \
17771777
 -D_HAVE__MINGW_H \
17781778
 -DSQLITE_USE_MALLOC_H \
1779
- -DSQLITE_USE_MSIZE
1779
+ -DSQLITE_USE_MSIZE \
1780
+ -DSQLITE_WIN32_NO_ANSI
17801781
17811782
 SHELL_OPTIONS = -Dmain=sqlite3_shell \
17821783
 -DSQLITE_OMIT_LOAD_EXTENSION=1 \
17831784
 -DUSE_SYSTEM_SQLITE=$(USE_SYSTEM_SQLITE) \
17841785
 -DSQLITE_SHELL_DBNAME_PROC=fossil_open \
17851786
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -1774,11 +1774,12 @@
1774 -DSQLITE_DEFAULT_FILE_FORMAT=4 \
1775 -DSQLITE_OMIT_DEPRECATED \
1776 -DSQLITE_ENABLE_EXPLAIN_COMMENTS \
1777 -D_HAVE__MINGW_H \
1778 -DSQLITE_USE_MALLOC_H \
1779 -DSQLITE_USE_MSIZE
 
1780
1781 SHELL_OPTIONS = -Dmain=sqlite3_shell \
1782 -DSQLITE_OMIT_LOAD_EXTENSION=1 \
1783 -DUSE_SYSTEM_SQLITE=$(USE_SYSTEM_SQLITE) \
1784 -DSQLITE_SHELL_DBNAME_PROC=fossil_open \
1785
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -1774,11 +1774,12 @@
1774 -DSQLITE_DEFAULT_FILE_FORMAT=4 \
1775 -DSQLITE_OMIT_DEPRECATED \
1776 -DSQLITE_ENABLE_EXPLAIN_COMMENTS \
1777 -D_HAVE__MINGW_H \
1778 -DSQLITE_USE_MALLOC_H \
1779 -DSQLITE_USE_MSIZE \
1780 -DSQLITE_WIN32_NO_ANSI
1781
1782 SHELL_OPTIONS = -Dmain=sqlite3_shell \
1783 -DSQLITE_OMIT_LOAD_EXTENSION=1 \
1784 -DUSE_SYSTEM_SQLITE=$(USE_SYSTEM_SQLITE) \
1785 -DSQLITE_SHELL_DBNAME_PROC=fossil_open \
1786

Keyboard Shortcuts

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