Change the OS_XXX pre-processor symbols to SQLITE_OS_XXX. Symbols "OS_UNIX", "OS_WIN", "OS_WINCE", "OS_OS2" and "OS_OTHER" are now "SQLITE_OS_UNIX", "SQLITE_OS_WIN", "SQLITE_OS_WINCE", "SQLITE_OS_OS2" and "SQLITE_OS_OTHER", respectively. (CVS 5311)

FossilOrigin-Name: cdd4cf4ce2ab363ddc3f27c5e44896e17269a161

Makefile.arm-wince-mingw32ce-gcc

@@ -63,7 +63,7 @@ TLIBS =
 #OPTS = -DSQLITE_DEBUG=2
 #OPTS = -DSQLITE_DEBUG=1
 #OPTS = 
-OPTS = -DNDEBUG=1 -DOS_WIN=1 -D_WIN32_WCE=1
+OPTS = -DNDEBUG=1 -DSQLITE_OS_WIN=1 -D_WIN32_WCE=1
 #OPTS += -DHAVE_FDATASYNC=1
 
 #### The suffix to add to executable files.  ".exe" for windows.

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for sqlite 3.5.9.
+# Generated by GNU Autoconf 2.59 for sqlite 3.6.0.
 #
 # Copyright (C) 2003 Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
@@ -416,8 +416,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='sqlite'
 PACKAGE_TARNAME='sqlite'
-PACKAGE_VERSION='3.5.9'
+PACKAGE_VERSION='3.6.0'
-PACKAGE_STRING='sqlite 3.5.9'
+PACKAGE_STRING='sqlite 3.6.0'
 PACKAGE_BUGREPORT=''
 
 # Factoring default headers for most tests.
@@ -457,7 +457,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS LIBTOOL build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT SED EGREP FGREP GREP LD DUMPBIN ac_ct_DUMPBIN NM LN_S AR ac_ct_AR STRIP ac_ct_STRIP RANLIB ac_ct_RANLIB lt_ECHO DSYMUTIL ac_ct_DSYMUTIL NMEDIT ac_ct_NMEDIT LIPO ac_ct_LIPO OTOOL ac_ct_OTOOL OTOOL64 ac_ct_OTOOL64 CPP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA AWK TCLSH_CMD program_prefix VERSION RELEASE VERSION_NUMBER BUILD_CC SQLITE_THREADSAFE XTHREADCONNECT THREADSOVERRIDELOCKS ALLOWRELEASE TEMP_STORE BUILD_EXEEXT OS_UNIX OS_WIN OS_OS2 TARGET_EXEEXT TCL_VERSION TCL_BIN_DIR TCL_SRC_DIR TCL_LIBS TCL_INCLUDE_SPEC TCL_LIB_FILE TCL_LIB_FLAG TCL_LIB_SPEC TCL_STUB_LIB_FILE TCL_STUB_LIB_FLAG TCL_STUB_LIB_SPEC HAVE_TCL TARGET_READLINE_LIBS TARGET_READLINE_INC TARGET_HAVE_READLINE TARGET_DEBUG USE_AMALGAMATION LOADEXTENSION_FLAGS USE_GCOV BUILD_CFLAGS LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS LIBTOOL build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT SED EGREP FGREP GREP LD DUMPBIN ac_ct_DUMPBIN NM LN_S AR ac_ct_AR STRIP ac_ct_STRIP RANLIB ac_ct_RANLIB lt_ECHO DSYMUTIL ac_ct_DSYMUTIL NMEDIT ac_ct_NMEDIT LIPO ac_ct_LIPO OTOOL ac_ct_OTOOL OTOOL64 ac_ct_OTOOL64 CPP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA AWK TCLSH_CMD program_prefix VERSION RELEASE VERSION_NUMBER BUILD_CC SQLITE_THREADSAFE XTHREADCONNECT THREADSOVERRIDELOCKS ALLOWRELEASE TEMP_STORE BUILD_EXEEXT SQLITE_OS_UNIX SQLITE_OS_WIN SQLITE_OS_OS2 TARGET_EXEEXT TCL_VERSION TCL_BIN_DIR TCL_SRC_DIR TCL_LIBS TCL_INCLUDE_SPEC TCL_LIB_FILE TCL_LIB_FLAG TCL_LIB_SPEC TCL_STUB_LIB_FILE TCL_STUB_LIB_FLAG TCL_STUB_LIB_SPEC HAVE_TCL TARGET_READLINE_LIBS TARGET_READLINE_INC TARGET_HAVE_READLINE TARGET_DEBUG USE_AMALGAMATION LOADEXTENSION_FLAGS USE_GCOV BUILD_CFLAGS LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -926,7 +926,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures sqlite 3.5.9 to adapt to many kinds of systems.
+\`configure' configures sqlite 3.6.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -987,7 +987,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of sqlite 3.5.9:";;
+     short | recursive ) echo "Configuration of sqlite 3.6.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1137,7 +1137,7 @@ fi
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-sqlite configure 3.5.9
+sqlite configure 3.6.0
 generated by GNU Autoconf 2.59
 
 Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1151,7 +1151,7 @@ cat >&5 <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by sqlite $as_me 3.5.9, which was
+It was created by sqlite $as_me 3.6.0, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
@@ -1489,7 +1489,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 # The following RCS revision string applies to configure.in
-# $Revision: 1.60 $
+# $Revision: 1.61 $
 
 #########
 # Programs needed
@@ -11261,27 +11261,27 @@ else
 fi
 if test "$TARGET_EXEEXT" = ".exe"; then
   if test $OS2_SHELL ; then
-    OS_UNIX=0
+    SQLITE_OS_UNIX=0
-    OS_WIN=0
+    SQLITE_OS_WIN=0
-    OS_OS2=1
+    SQLITE_OS_OS2=1
-    CFLAGS="$CFLAGS -DOS_OS2=1"
+    CFLAGS="$CFLAGS -DSQLITE_OS_OS2=1"
     if test "$ac_compiler_gnu" = "yes" ; then
       CFLAGS="$CFLAGS -Zomf -Zexe -Zmap"
       BUILD_CFLAGS="$BUILD_CFLAGS -Zomf -Zexe"
     fi
   else
-    OS_UNIX=0
+    SQLITE_OS_UNIX=0
-    OS_WIN=1
+    SQLITE_OS_WIN=1
-    OS_OS2=0
+    SQLITE_OS_OS2=0
     tclsubdir=win
-    CFLAGS="$CFLAGS -DOS_WIN=1"
+    CFLAGS="$CFLAGS -DSQLITE_OS_WIN=1"
   fi
 else
-  OS_UNIX=1
+  SQLITE_OS_UNIX=1
-  OS_WIN=0
+  SQLITE_OS_WIN=0
-  OS_OS2=0
+  SQLITE_OS_OS2=0
   tclsubdir=unix
-  CFLAGS="$CFLAGS -DOS_UNIX=1"
+  CFLAGS="$CFLAGS -DSQLITE_OS_UNIX=1"
 fi
 
 
@@ -12461,7 +12461,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by sqlite $as_me 3.5.9, which was
+This file was extended by sqlite $as_me 3.6.0, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -12524,7 +12524,7 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-sqlite config.status 3.5.9
+sqlite config.status 3.6.0
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
@@ -13034,9 +13034,9 @@ s,@THREADSOVERRIDELOCKS@,$THREADSOVERRIDELOCKS,;t t
 s,@ALLOWRELEASE@,$ALLOWRELEASE,;t t
 s,@TEMP_STORE@,$TEMP_STORE,;t t
 s,@BUILD_EXEEXT@,$BUILD_EXEEXT,;t t
-s,@OS_UNIX@,$OS_UNIX,;t t
+s,@SQLITE_OS_UNIX@,$SQLITE_OS_UNIX,;t t
-s,@OS_WIN@,$OS_WIN,;t t
+s,@SQLITE_OS_WIN@,$SQLITE_OS_WIN,;t t
-s,@OS_OS2@,$OS_OS2,;t t
+s,@SQLITE_OS_OS2@,$SQLITE_OS_OS2,;t t
 s,@TARGET_EXEEXT@,$TARGET_EXEEXT,;t t
 s,@TCL_VERSION@,$TCL_VERSION,;t t
 s,@TCL_BIN_DIR@,$TCL_BIN_DIR,;t t

configure.ac

@@ -92,7 +92,7 @@ AC_INIT(sqlite, m4_esyscmd([cat VERSION | tr -d '\n']))
 dnl Put the RCS revision string after AC_INIT so that it will also
 dnl show in in configure.
 # The following RCS revision string applies to configure.in
-# $Revision: 1.45 $
+# $Revision: 1.46 $
 
 #########
 # Programs needed
@@ -340,33 +340,33 @@ else
 fi
 if test "$TARGET_EXEEXT" = ".exe"; then
   if test $OS2_SHELL ; then
-    OS_UNIX=0
+    SQLITE_OS_UNIX=0
-    OS_WIN=0
+    SQLITE_OS_WIN=0
-    OS_OS2=1
+    SQLITE_OS_OS2=1
-    CFLAGS="$CFLAGS -DOS_OS2=1"
+    CFLAGS="$CFLAGS -DSQLITE_OS_OS2=1"
     if test "$ac_compiler_gnu" = "yes" ; then
       CFLAGS="$CFLAGS -Zomf -Zexe -Zmap"
       BUILD_CFLAGS="$BUILD_CFLAGS -Zomf -Zexe"
     fi
   else
-    OS_UNIX=0
+    SQLITE_OS_UNIX=0
-    OS_WIN=1
+    SQLITE_OS_WIN=1
-    OS_OS2=0
+    SQLITE_OS_OS2=0
     tclsubdir=win
-    CFLAGS="$CFLAGS -DOS_WIN=1"
+    CFLAGS="$CFLAGS -DSQLITE_OS_WIN=1"
   fi
 else
-  OS_UNIX=1
+  SQLITE_OS_UNIX=1
-  OS_WIN=0
+  SQLITE_OS_WIN=0
-  OS_OS2=0
+  SQLITE_OS_OS2=0
   tclsubdir=unix
-  CFLAGS="$CFLAGS -DOS_UNIX=1"
+  CFLAGS="$CFLAGS -DSQLITE_OS_UNIX=1"
 fi
 
 AC_SUBST(BUILD_EXEEXT)
-AC_SUBST(OS_UNIX)
+AC_SUBST(SQLITE_OS_UNIX)
-AC_SUBST(OS_WIN)
+AC_SUBST(SQLITE_OS_WIN)
-AC_SUBST(OS_OS2)
+AC_SUBST(SQLITE_OS_OS2)
 AC_SUBST(TARGET_EXEEXT)
 
 ##########

manifest

@@ -1,6 +1,6 @@
-C Fix\sa\srace\scondition\sin\ssqlite3_initialize().\s(CVS\s5310)
+C Change\sthe\sOS_XXX\spre-processor\ssymbols\sto\sSQLITE_OS_XXX.\sSymbols\s"OS_UNIX",\s"OS_WIN",\s"OS_WINCE",\s"OS_OS2"\sand\s"OS_OTHER"\sare\snow\s"SQLITE_OS_UNIX",\s"SQLITE_OS_WIN",\s"SQLITE_OS_WINCE",\s"SQLITE_OS_OS2"\sand\s"SQLITE_OS_OTHER",\srespectively.\s(CVS\s5311)
-D 2008-06-26T08:29:34
+D 2008-06-26T10:41:19
-F Makefile.arm-wince-mingw32ce-gcc ac5f7b2cef0cd850d6f755ba6ee4ab961b1fadf7
+F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in dcf0ecf664a31c257f540d32e5d69a09edf962f0
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
 F README b974cdc3f9f12b87e851b04e75996d720ebf81ac
@@ -17,8 +17,8 @@ F art/powered_by_sqlite.gif 7fbcd7d3675391fd3d21672c14c05f5999eb60d1
 F config.guess 226d9a188c6196f3033ffc651cbc9dcee1a42977
 F config.h.in 7940ca68451e949b9b4c83814a7c719721eea6e1
 F config.sub 9ebe4c3b3dab6431ece34f16828b594fb420da55
-F configure 26628e967aafe0ff04cf967abc1f38b648093ff1 x
+F configure 300a0748b8c5cb10195e11c70f23cfe19fc455ce x
-F configure.ac d106f5114a042ffbd43db0537ca22aa6c4c6dd4d
+F configure.ac 732bfbb23e2ea8c6c79012d3a0f0f83e855ecbb1
 F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad
 F doc/lemon.html f0f682f50210928c07e562621c3b7e8ab912a538
 F doc/report1.txt a031aaf37b185e4fa540223cb516d3bccec7eeac
@@ -76,9 +76,9 @@ F ext/rtree/viewrtree.tcl 09526398dae87a5a87c5aac2b3854dbaf8376869
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895
 F ltmain.sh 09fe5815427dc7d0abb188bbcdf0e34896577210
 F main.mk 4b4961d11a76f6f6c54f1137326ea6a556f359f8
-F mkdll.sh 712e74f3efe08a6ba12b2945d018a29a89d7fe3b
+F mkdll.sh ce8c8cc3528d63eda1702eb65b17c2d710eb3b89
 F mkextu.sh 416f9b7089d80e5590a29692c9d9280a10dbad9f
-F mkextw.sh 1a866b53637dab137191341cc875575a5ca110fb
+F mkextw.sh 4123480947681d9b434a5e7b1ee08135abe409ac
 F mkopcodec.awk 3fb9bf077053c968451f4dd03d11661ac373f9d1
 F mkopcodeh.awk 513946ce4429bf2723aef0d640eb4d2493deb68e
 F mkso.sh 24bde4c09e6fe80f718db3c31c068f45e13a2f2c
@@ -114,7 +114,7 @@ F src/insert.c f8c7da31409ec19a769b960a4a2b9cca7bab80bd
 F src/journal.c cffd2cd214e58c0e99c3ff632b3bee6c7cbb260e
 F src/legacy.c 3626c71fb70912abec9a4312beba753a9ce800df
 F src/loadext.c 40024a0f476c1279494876b9a002001b29e5d3e3
-F src/main.c f26f9dd14d04f2d4c7492627dd9ad2f62e5bfe06
+F src/main.c 854dabef0de7653234b22a4431c93a50c8513af3
 F src/malloc.c f52166df8abd7ff6990dbee1a0ce3534addc8617
 F src/md5.c 008216bbb5d34c6fbab5357aa68575ad8a31516a
 F src/mem1.c 8340fa5f969e9f9b9bdeb54106457a2003456d2b
@@ -123,16 +123,16 @@ F src/mem3.c 8d34a22617a0eb96c05a83fc2c4fbbaed6bcfde1
 F src/mem4.c 6703adb1717b26d9d70a1c2586b4b7b7ffee7909
 F src/mem5.c d0c7c8506eb3f64c0ea0f1e8defab4043f531dad
 F src/mutex.c a485a0eac8ee2cd95f66e565b4c6696c18db968f
-F src/mutex.h 236677b27760d85701b5872d01b5cafedde5f0a9
+F src/mutex.h e52ffa1dfc6a6077e8b1823d2c2b7dfcbcf85594
 F src/mutex_os2.c 9c5637aa4c307c552566d0f0b3bd206245b54a97
 F src/mutex_unix.c c1526811f4b97a7cd9d4d72d2b9623d06abd05ce
-F src/mutex_w32.c 7aa9ad79b36931314b81ac4045f40f2c503b1e44
+F src/mutex_w32.c f0d21ff1f6981e5aedc56796adf3a347423ef736
-F src/os.c a8ef763c0f196c928be23e20ca5d7911bc095318
+F src/os.c 2b0b710dc1bcf69de7c9c54ed0cf98f5cb38bbd1
-F src/os.h a7bc8d7232b69ce8ba536cafd8514c877bc3342c
+F src/os.h ef8abeb9afc694b82dbd169a91c9b7e26db3c892
 F src/os_common.h 24525d8b7bce66c374dfc1810a6c9043f3359b60
-F src/os_os2.c 205900770c90f77718dcae4d8f28c60ab4657250
+F src/os_os2.c 38fd8cfb1c122c39e451d9f3e779c602283dba33
-F src/os_unix.c 800138f4b9e2c26c89b0f8085441ec188fd5c19e
+F src/os_unix.c 8b5116abc14013f059b6bb736b765db6fe1d51e0
-F src/os_win.c 77cae913383157348a4ac0a6385e8543b28103a1
+F src/os_win.c 2bf2f8cd700299564cc236262c2668e1e02c626a
 F src/pager.c e2a49872f1e15eb83895ace704c48ac8ded998ba
 F src/pager.h 6aa3050a3c684475a5a9dbad5ff1cebad612acba
 F src/parse.y 8c2c3145eebe1964eb279cb3c4e502eae28bb0fa
@@ -141,7 +141,7 @@ F src/prepare.c aba51dad52308e3d9d2074d8ff4e612e7f1cab51
 F src/printf.c 8b063da9dcde26b7c500a01444b718d86f21bc6e
 F src/random.c 5c754319d38abdd6acd74601ee0105504adc508a
 F src/select.c 79f60dc4a7e90bb907c7a2cca42f45276d1ead99
-F src/shell.c 61fa61932ed52825720ebfd3f8381b8d550ef766
+F src/shell.c 479807b87f0409289eec4a776cd6ae56d30544b1
 F src/sqlite.h.in 0dfa5d11d2c063ef551cbc9f3933295857e420fc
 F src/sqlite3ext.h f162a72daef5ebf8b211fe8c0ec96e85d22fbf9b
 F src/sqliteInt.h 71e0839f4d4d8bcb59513da8a74d6652f379b145
@@ -149,19 +149,19 @@ F src/sqliteLimit.h f435e728c6b620ef7312814d660a81f9356eb5c8
 F src/status.c 6cb10377992505bd69f1ca1d75c1240a65f25a58
 F src/table.c 1fa8f8113ac9cbc09ae4801c6d2a7f0af82c5822
 F src/tclsqlite.c 4dd9ee4cb44846ad9bcc4d0da8088c1e7d4b33d9
-F src/test1.c e78c07d7f1db40593ab1e4aa321016184af0c7ad
+F src/test1.c 618dfc3af2f57c5f711708b7296ac98154c472c1
 F src/test2.c c46d146019ab6e37474e66b3c789e5237d9ea7b7
 F src/test3.c 01ff03164cf6a2bededa3b44ecd481603e2644fc
-F src/test4.c c2c0f5dc907f1346f5d4b65eb5799f11eb9e4071
+F src/test4.c ff4ecde3cafc71337b04e8cb7da5bb88e85d70e7
 F src/test5.c 3a6a5717a149d7ca2e6d14f5be72cf7555d54dc4
 F src/test6.c 0a0304a69cfa4962a429d084c6d451ff9e4fb572
-F src/test7.c acec2256c7c2d279db5a8b5fa1a2a68fcc942c67
+F src/test7.c 19474b1802858cd2017493c907f70ac2d57ab092
 F src/test8.c 7230aff5df11dd3a39ad9f4278ece540e3b71a38
 F src/test9.c 4615ef08750245a2d96aaa7cbe2fb4aff2b57acc
-F src/test_async.c fb5ab7b54c0b4ece9e2283b9c38314ba5d40bab6
+F src/test_async.c da9f58f49faccd3a26ba89f58de125862351b6e2
 F src/test_autoext.c 5e892ab84aece3f0428920bf46923f16ac83962a
 F src/test_btree.c c1308ba0b88ab577fa56c9e493a09829dfcded9c
-F src/test_config.c 95d63ffc4f06f3f89d8450662140dd1bd793083a
+F src/test_config.c 9a00dbd91db9e470868537580ab5f9b2744aecb9
 F src/test_devsym.c 6012cb8e3acf812513511025a4fa5d626e0ba19b
 F src/test_func.c f4aafa10f17d52c43a64b47717265802e6e552b3
 F src/test_hexio.c 2f1122aa3f012fa0142ee3c36ce5c902a70cd12f
@@ -172,7 +172,7 @@ F src/test_mutex.c b1433eb96520656fb3e4a218253a94ac32bd5775
 F src/test_onefile.c 1f87d4a21cbfb24a7c35e4333fa0bd34d641f68d
 F src/test_osinst.c 867f1317bd135f942a63eab5a78da40fc70d1493
 F src/test_schema.c e3f93725f7c5b2cff84a69dc4332040dfbc8f81a
-F src/test_server.c 7e579eb9bf6fbe9cc45e84e4c74d3d06d049a825
+F src/test_server.c f0a403b5f699c09bd2b1236b6f69830fd6221f6b
 F src/test_tclvar.c e99b975614735553fa1c43503d85b0dd988c0e77
 F src/test_thread.c e297dd41db0b249646e69f97d36ec13e56e8b730
 F src/tokenize.c d39f0d6ce75ca9d0fa4041baec42b5e0411a74fc
@@ -581,12 +581,12 @@ F tool/mkkeywordhash.c ef93810fc41fb3d3dbacf9a33a29be88ea99ffa9
 F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e x
 F tool/mksqlite3c.tcl d7fea82624d6f7c4bfee3be558038d7f27913189
 F tool/mksqlite3internalh.tcl 7b43894e21bcb1bb39e11547ce7e38a063357e87
-F tool/omittest.tcl 7d1fdf469e2f4d175f70c36e469db64a1626fabb
+F tool/omittest.tcl e29ddad7f546c5aad0198dca389066c3bda53f2d
 F tool/opcodeDoc.awk b3a2a3d5d3075b8bd90b7afe24283efdd586659c
 F tool/report1.txt 9eae07f26a8fc53889b45fc833a66a33daa22816
 F tool/showdb.c a086a3d788c7a23cb008317c3180ceb19f20bce0
 F tool/showjournal.c ec3b171be148656827c4949fbfb8ab4370822f87
-F tool/soak1.tcl 85a4a7826c77351bfe1c005ae3cff2ef59123557
+F tool/soak1.tcl 8f1ae78983fc69875a7fd842674a89bbdd6f2f92
 F tool/space_used.tcl f714c41a59e326b8b9042f415b628b561bafa06b
 F tool/spaceanal.tcl b87db46ae29e3116411b1686e136b9b994d7de39
 F tool/speedtest.tcl 06c76698485ccf597b9e7dbb1ac70706eb873355
@@ -594,7 +594,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 1dbced29de5f59ba2ebf877edcadf171540374d1
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P cdc4e75a9f1e3c79ade92344cf32a4225222d44f
+P 70b2ed2afcf1757d1c58f3a83dad4a5fb226ae63
-R efe6dda44f31dc9f1fb0b947215f7682
+R df8b8896ce8671ae160fad9b334243c6
 U danielk1977
-Z d08f97cc458894258dd8328a21886eae
+Z 3d25949f4d1f7064f4f07f76e0a70374

manifest.uuid

@@ -1 +1 @@
-70b2ed2afcf1757d1c58f3a83dad4a5fb226ae63
+cdd4cf4ce2ab363ddc3f27c5e44896e17269a161

mkdll.sh

@@ -10,7 +10,7 @@ make sqlite3.c
 PATH=$PATH:/opt/mingw/bin
 TCLDIR=/home/drh/tcltk/846/win/846win
 TCLSTUBLIB=$TCLDIR/libtcl84stub.a
-OPTS='-DUSE_TCL_STUBS=1 -DSQLITE_THREADSAFE=1 -DBUILD_sqlite=1 -DOS_WIN=1'
+OPTS='-DUSE_TCL_STUBS=1 -DSQLITE_THREADSAFE=1 -DBUILD_sqlite=1 -DSQLITE_OS_WIN=1'
 OPTS="$OPTS -DSQLITE_ENABLE_FTS3=1"
 CC="i386-mingw32msvc-gcc -Os $OPTS -Itsrc -I$TCLDIR"
 NM="i386-mingw32msvc-nm"

mkextw.sh

@@ -4,7 +4,7 @@
 #
 make fts2amal.c
 PATH=$PATH:/opt/mingw/bin
-OPTS='-DTHREADSAFE=1 -DBUILD_sqlite=1 -DOS_WIN=1'
+OPTS='-DTHREADSAFE=1 -DBUILD_sqlite=1 -DSQLITE_OS_WIN=1'
 CC="i386-mingw32msvc-gcc -O2 $OPTS -Itsrc"
 NM="i386-mingw32msvc-nm"
 CMD="$CC -c fts2amal.c"

src/main.c

@@ -14,7 +14,7 @@
 ** other files are for internal use by SQLite and should not be
 ** accessed by users of the library.
 **
-** $Id: main.c,v 1.463 2008/06/26 08:29:34 danielk1977 Exp $
+** $Id: main.c,v 1.464 2008/06/26 10:41:19 danielk1977 Exp $
 */
 #include "sqliteInt.h"
 #include <ctype.h>
@@ -524,7 +524,7 @@ static int sqliteDefaultBusyCallback(
  void *ptr,               /* Database connection */
  int count                /* Number of times table has been busy */
 ){
-#if OS_WIN || (defined(HAVE_USLEEP) && HAVE_USLEEP)
+#if SQLITE_OS_WIN || (defined(HAVE_USLEEP) && HAVE_USLEEP)
   static const u8 delays[] =
      { 1, 2, 5, 10, 15, 20, 25, 25,  25,  50,  50, 100 };
   static const u8 totals[] =

src/mutex.h

@@ -19,7 +19,7 @@
 ** Source files should #include the sqliteInt.h file and let that file
 ** include this one indirectly.
 **
-** $Id: mutex.h,v 1.7 2008/06/19 01:50:09 drh Exp $
+** $Id: mutex.h,v 1.8 2008/06/26 10:41:19 danielk1977 Exp $
 */
 
 
@@ -53,15 +53,15 @@
 # undef SQLITE_MUTEX_NOOP
 # define SQLITE_MUTEX_NOOP_DEBUG
 #endif
-#if defined(SQLITE_MUTEX_NOOP) && SQLITE_THREADSAFE && OS_UNIX
+#if defined(SQLITE_MUTEX_NOOP) && SQLITE_THREADSAFE && SQLITE_OS_UNIX
 # undef SQLITE_MUTEX_NOOP
 # define SQLITE_MUTEX_PTHREADS
 #endif
-#if defined(SQLITE_MUTEX_NOOP) && SQLITE_THREADSAFE && OS_WIN
+#if defined(SQLITE_MUTEX_NOOP) && SQLITE_THREADSAFE && SQLITE_OS_WIN
 # undef SQLITE_MUTEX_NOOP
 # define SQLITE_MUTEX_W32
 #endif
-#if defined(SQLITE_MUTEX_NOOP) && SQLITE_THREADSAFE && OS_OS2
+#if defined(SQLITE_MUTEX_NOOP) && SQLITE_THREADSAFE && SQLITE_OS_OS2
 # undef SQLITE_MUTEX_NOOP
 # define SQLITE_MUTEX_OS2
 #endif

src/mutex_w32.c

@@ -11,7 +11,7 @@
 *************************************************************************
 ** This file contains the C functions that implement mutexes for win32
 **
-** $Id: mutex_w32.c,v 1.10 2008/06/19 16:07:07 drh Exp $
+** $Id: mutex_w32.c,v 1.11 2008/06/26 10:41:19 danielk1977 Exp $
 */
 #include "sqliteInt.h"
 
@@ -42,7 +42,7 @@ struct sqlite3_mutex {
 ** WinNT/2K/XP so that we will know whether or not we can safely call
 ** the LockFileEx() API.
 */
-#if OS_WINCE
+#if SQLITE_OS_WINCE
 # define mutexIsNT()  (1)
 #else
   static int mutexIsNT(void){
@@ -55,7 +55,7 @@ struct sqlite3_mutex {
     }
     return osType==2;
   }
-#endif /* OS_WINCE */
+#endif /* SQLITE_OS_WINCE */
 
 
 #ifdef SQLITE_DEBUG

src/os.c

@@ -13,7 +13,7 @@
 ** This file contains OS interface code that is common to all
 ** architectures.
 **
-** $Id: os.c,v 1.117 2008/06/26 08:29:34 danielk1977 Exp $
+** $Id: os.c,v 1.118 2008/06/26 10:41:19 danielk1977 Exp $
 */
 #define _SQLITE_OS_C_ 1
 #include "sqliteInt.h"
@@ -36,7 +36,7 @@
 **     sqlite3OsLock()
 **
 */
-#if defined(SQLITE_TEST) && (OS_WIN==0)
+#if defined(SQLITE_TEST) && (SQLITE_OS_WIN==0)
   #define DO_OS_MALLOC_TEST if (1) {            \
     void *pTstAlloc = sqlite3Malloc(10);       \
     if (!pTstAlloc) return SQLITE_IOERR_NOMEM;  \

src/os.h

@@ -17,7 +17,7 @@
 ** This header file is #include-ed by sqliteInt.h and thus ends up
 ** being included by every source file.
 **
-** $Id: os.h,v 1.104 2008/06/25 17:19:01 danielk1977 Exp $
+** $Id: os.h,v 1.105 2008/06/26 10:41:19 danielk1977 Exp $
 */
 #ifndef _SQLITE_OS_H_
 #define _SQLITE_OS_H_
@@ -25,44 +25,45 @@
 /*
 ** Figure out if we are dealing with Unix, Windows, or some other
 ** operating system.  After the following block of preprocess macros,
-** all of OS_UNIX, OS_WIN, OS_OS2, and OS_OTHER will defined to either
+** all of SQLITE_OS_UNIX, SQLITE_OS_WIN, SQLITE_OS_OS2, and SQLITE_OS_OTHER 
-** 1 or 0.  One of the four will be 1.  The other three will be 0.
+** will defined to either 1 or 0.  One of the four will be 1.  The other 
+** three will be 0.
 */
-#if defined(OS_OTHER)
+#if defined(SQLITE_OS_OTHER)
-# if OS_OTHER==1
+# if SQLITE_OS_OTHER==1
-#   undef OS_UNIX
+#   undef SQLITE_OS_UNIX
-#   define OS_UNIX 0
+#   define SQLITE_OS_UNIX 0
-#   undef OS_WIN
+#   undef SQLITE_OS_WIN
-#   define OS_WIN 0
+#   define SQLITE_OS_WIN 0
-#   undef OS_OS2
+#   undef SQLITE_OS_OS2
-#   define OS_OS2 0
+#   define SQLITE_OS_OS2 0
 # else
-#   undef OS_OTHER
+#   undef SQLITE_OS_OTHER
 # endif
 #endif
-#if !defined(OS_UNIX) && !defined(OS_OTHER)
+#if !defined(SQLITE_OS_UNIX) && !defined(SQLITE_OS_OTHER)
-# define OS_OTHER 0
+# define SQLITE_OS_OTHER 0
-# ifndef OS_WIN
+# ifndef SQLITE_OS_WIN
 #   if defined(_WIN32) || defined(WIN32) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__BORLANDC__)
-#     define OS_WIN 1
+#     define SQLITE_OS_WIN 1
-#     define OS_UNIX 0
+#     define SQLITE_OS_UNIX 0
-#     define OS_OS2 0
+#     define SQLITE_OS_OS2 0
 #   elif defined(__EMX__) || defined(_OS2) || defined(OS2) || defined(_OS2_) || defined(__OS2__)
-#     define OS_WIN 0
+#     define SQLITE_OS_WIN 0
-#     define OS_UNIX 0
+#     define SQLITE_OS_UNIX 0
-#     define OS_OS2 1
+#     define SQLITE_OS_OS2 1
 #   else
-#     define OS_WIN 0
+#     define SQLITE_OS_WIN 0
-#     define OS_UNIX 1
+#     define SQLITE_OS_UNIX 1
-#     define OS_OS2 0
+#     define SQLITE_OS_OS2 0
 #  endif
 # else
-#  define OS_UNIX 0
+#  define SQLITE_OS_UNIX 0
-#  define OS_OS2 0
+#  define SQLITE_OS_OS2 0
 # endif
 #else
-# ifndef OS_WIN
+# ifndef SQLITE_OS_WIN
-#  define OS_WIN 0
+#  define SQLITE_OS_WIN 0
 # endif
 #endif
 
@@ -71,19 +72,19 @@
 ** reduced API.
 */
 #if defined(_WIN32_WCE)
-# define OS_WINCE 1
+# define SQLITE_OS_WINCE 1
 #else
-# define OS_WINCE 0
+# define SQLITE_OS_WINCE 0
 #endif
 
 
 /*
 ** Define the maximum size of a temporary filename
 */
-#if OS_WIN
+#if SQLITE_OS_WIN
 # include <windows.h>
 # define SQLITE_TEMPNAME_SIZE (MAX_PATH+50)
-#elif OS_OS2
+#elif SQLITE_OS_OS2
 # if (__GNUC__ > 3 || __GNUC__ == 3 && __GNUC_MINOR__ >= 3) && defined(OS2_HIGH_MEMORY)
 #  include <os2safe.h> /* has to be included before os2.h for linking to work */
 # endif

src/os_os2.c

@@ -12,12 +12,12 @@
 **
 ** This file contains code that is specific to OS/2.
 **
-** $Id: os_os2.c,v 1.46 2008/06/25 17:19:01 danielk1977 Exp $
+** $Id: os_os2.c,v 1.47 2008/06/26 10:41:19 danielk1977 Exp $
 */
 
 #include "sqliteInt.h"
 
-#if OS_OS2
+#if SQLITE_OS_OS2
 
 /*
 ** A Note About Memory Allocation:
@@ -1077,4 +1077,4 @@ int sqlite3_os_end(void){
   return SQLITE_OK; 
 }
 
-#endif /* OS_OS2 */
+#endif /* SQLITE_OS_OS2 */

src/os_unix.c

@@ -12,10 +12,10 @@
 **
 ** This file contains code that is specific to Unix systems.
 **
-** $Id: os_unix.c,v 1.189 2008/06/25 17:19:01 danielk1977 Exp $
+** $Id: os_unix.c,v 1.190 2008/06/26 10:41:19 danielk1977 Exp $
 */
 #include "sqliteInt.h"
-#if OS_UNIX              /* This file is used on unix only */
+#if SQLITE_OS_UNIX              /* This file is used on unix only */
 
 /* #define SQLITE_ENABLE_LOCKING_STYLE 0 */
 
@@ -2811,4 +2811,4 @@ int sqlite3_os_end(void){
   return SQLITE_OK; 
 }
  
-#endif /* OS_UNIX */
+#endif /* SQLITE_OS_UNIX */

src/os_win.c

@@ -12,10 +12,10 @@
 **
 ** This file contains code that is specific to windows.
 **
-** $Id: os_win.c,v 1.128 2008/06/25 17:19:01 danielk1977 Exp $
+** $Id: os_win.c,v 1.129 2008/06/26 10:41:19 danielk1977 Exp $
 */
 #include "sqliteInt.h"
-#if OS_WIN               /* This file is used for windows only */
+#if SQLITE_OS_WIN               /* This file is used for windows only */
 
 
 /*
@@ -66,7 +66,7 @@
 ** Determine if we are dealing with WindowsCE - which has a much
 ** reduced API.
 */
-#if defined(OS_WINCE)
+#if defined(SQLITE_OS_WINCE)
 # define AreFileApisANSI() 1
 #endif
 
@@ -74,7 +74,7 @@
 ** WinCE lacks native support for file locking so we have to fake it
 ** with some code of our own.
 */
-#if OS_WINCE
+#if SQLITE_OS_WINCE
 typedef struct winceLock {
   int nReaders;       /* Number of reader locks obtained */
   BOOL bPending;      /* Indicates a pending lock has been obtained */
@@ -93,7 +93,7 @@ struct winFile {
   HANDLE h;               /* Handle for accessing the file */
   unsigned char locktype; /* Type of lock currently held on this file */
   short sharedLockByte;   /* Randomly chosen byte used as a shared lock */
-#if OS_WINCE
+#if SQLITE_OS_WINCE
   WCHAR *zDeleteOnClose;  /* Name of file to delete when closing */
   HANDLE hMutex;          /* Mutex used to control access to shared lock */  
   HANDLE hShared;         /* Shared memory segment used for locking */
@@ -132,7 +132,7 @@ static int sqlite3_os_type = 0;
 ** WinNT/2K/XP so that we will know whether or not we can safely call
 ** the LockFileEx() API.
 */
-#if OS_WINCE
+#if SQLITE_OS_WINCE
 # define isNT()  (1)
 #else
   static int isNT(void){
@@ -144,7 +144,7 @@ static int sqlite3_os_type = 0;
     }
     return sqlite3_os_type==2;
   }
-#endif /* OS_WINCE */
+#endif /* SQLITE_OS_WINCE */
 
 /*
 ** Convert a UTF-8 string to microsoft unicode (UTF-16?). 
@@ -275,7 +275,7 @@ static char *utf8ToMbcs(const char *zFilename){
   return zFilenameMbcs;
 }
 
-#if OS_WINCE
+#if SQLITE_OS_WINCE
 /*************************************************************************
 ** This section contains code for WinCE only.
 */
@@ -579,7 +579,7 @@ static BOOL winceLockFileEx(
 /*
 ** End of the special code for wince
 *****************************************************************************/
-#endif /* OS_WINCE */
+#endif /* SQLITE_OS_WINCE */
 
 /*****************************************************************************
 ** The next group of routines implement the I/O methods specified
@@ -604,7 +604,7 @@ static int winClose(sqlite3_file *id){
   do{
     rc = CloseHandle(pFile->h);
   }while( rc==0 && cnt++ < MX_CLOSE_ATTEMPT && (Sleep(100), 1) );
-#if OS_WINCE
+#if SQLITE_OS_WINCE
 #define WINCE_DELETION_ATTEMPTS 3
   winceDestroyLock(pFile);
   if( pFile->zDeleteOnClose ){
@@ -1179,7 +1179,7 @@ static int winOpen(
     dwShareMode = 0;
   }
   if( flags & SQLITE_OPEN_DELETEONCLOSE ){
-#if OS_WINCE
+#if SQLITE_OS_WINCE
     dwFlagsAndAttributes = FILE_ATTRIBUTE_HIDDEN;
 #else
     dwFlagsAndAttributes = FILE_ATTRIBUTE_TEMPORARY
@@ -1204,7 +1204,7 @@ static int winOpen(
        NULL
     );
   }else{
-#if OS_WINCE
+#if SQLITE_OS_WINCE
     return SQLITE_NOMEM;
 #else
     h = CreateFileA((char*)zConverted,
@@ -1236,7 +1236,7 @@ static int winOpen(
   memset(pFile, 0, sizeof(*pFile));
   pFile->pMethod = &winIoMethod;
   pFile->h = h;
-#if OS_WINCE
+#if SQLITE_OS_WINCE
   if( (flags & (SQLITE_OPEN_READWRITE|SQLITE_OPEN_MAIN_DB)) ==
                (SQLITE_OPEN_READWRITE|SQLITE_OPEN_MAIN_DB)
        && !winceCreateLock(zName, pFile)
@@ -1287,7 +1287,7 @@ static int winDelete(
     }while( (rc = GetFileAttributesW(zConverted))!=0xffffffff 
             && cnt++ < MX_DELETION_ATTEMPTS && (Sleep(100), 1) );
   }else{
-#if OS_WINCE
+#if SQLITE_OS_WINCE
     return SQLITE_NOMEM;
 #else
     do{
@@ -1319,7 +1319,7 @@ static int winAccess(
   if( isNT() ){
     attr = GetFileAttributesW((WCHAR*)zConverted);
   }else{
-#if OS_WINCE
+#if SQLITE_OS_WINCE
     return SQLITE_NOMEM;
 #else
     attr = GetFileAttributesA((char*)zConverted);
@@ -1359,13 +1359,13 @@ static int winFullPathname(
   return SQLITE_OK;
 #endif
 
-#if OS_WINCE
+#if SQLITE_OS_WINCE
   /* WinCE has no concept of a relative pathname, or so I am told. */
   sqlite3_snprintf(pVfs->mxPathname, zFull, "%s", zRelative);
   return SQLITE_OK;
 #endif
 
-#if !OS_WINCE && !defined(__CYGWIN__)
+#if !SQLITE_OS_WINCE && !defined(__CYGWIN__)
   int nByte;
   void *zConverted;
   char *zOut;
@@ -1423,7 +1423,7 @@ static void *winDlOpen(sqlite3_vfs *pVfs, const char *zFilename){
   if( isNT() ){
     h = LoadLibraryW((WCHAR*)zConverted);
   }else{
-#if OS_WINCE
+#if SQLITE_OS_WINCE
     return 0;
 #else
     h = LoadLibraryA((char*)zConverted);
@@ -1433,7 +1433,7 @@ static void *winDlOpen(sqlite3_vfs *pVfs, const char *zFilename){
   return (void*)h;
 }
 static void winDlError(sqlite3_vfs *pVfs, int nBuf, char *zBufOut){
-#if OS_WINCE
+#if SQLITE_OS_WINCE
   int error = GetLastError();
   if( error>0x7FFFFFF ){
     sqlite3_snprintf(nBuf, zBufOut, "OsError 0x%x", error);
@@ -1453,7 +1453,7 @@ static void winDlError(sqlite3_vfs *pVfs, int nBuf, char *zBufOut){
 #endif
 }
 void *winDlSym(sqlite3_vfs *pVfs, void *pHandle, const char *zSymbol){
-#if OS_WINCE
+#if SQLITE_OS_WINCE
   /* The GetProcAddressA() routine is only available on wince. */
   return GetProcAddressA((HANDLE)pHandle, zSymbol);
 #else
@@ -1531,7 +1531,7 @@ int winCurrentTime(sqlite3_vfs *pVfs, double *prNow){
      100-nanosecond intervals since January 1, 1601 (= JD 2305813.5). 
   */
   double now;
-#if OS_WINCE
+#if SQLITE_OS_WINCE
   SYSTEMTIME time;
   GetSystemTime(&time);
   SystemTimeToFileTime(&time,&ft);
@@ -1584,4 +1584,4 @@ int sqlite3_os_end(void){
   return SQLITE_OK;
 }
 
-#endif /* OS_WIN */
+#endif /* SQLITE_OS_WIN */

src/shell.c

@@ -12,7 +12,7 @@
 ** This file contains code to implement the "sqlite" command line
 ** utility for accessing SQLite databases.
 **
-** $Id: shell.c,v 1.181 2008/06/23 21:26:05 mihailim Exp $
+** $Id: shell.c,v 1.182 2008/06/26 10:41:19 danielk1977 Exp $
 */
 #include <stdlib.h>
 #include <string.h>
@@ -1946,7 +1946,7 @@ int main(int argc, char **argv){
     }
   }
   if( i<argc ){
-#if defined(OS_OS2) && OS_OS2
+#if defined(SQLITE_OS_OS2) && SQLITE_OS_OS2
     data.zDbFilename = (const char *)convertCpPathToUtf8( argv[i++] );
 #else
     data.zDbFilename = argv[i++];

src/test1.c

@@ -13,7 +13,7 @@
 ** is not included in the SQLite library.  It is used for automated
 ** testing of the SQLite library.
 **
-** $Id: test1.c,v 1.306 2008/06/19 02:52:25 drh Exp $
+** $Id: test1.c,v 1.307 2008/06/26 10:41:19 danielk1977 Exp $
 */
 #include "sqliteInt.h"
 #include "tcl.h"
@@ -4736,10 +4736,10 @@ int Sqlitetest1_Init(Tcl_Interp *interp){
   extern int sqlite3_pager_writedb_count;
   extern int sqlite3_pager_writej_count;
   extern int sqlite3_pager_pgfree_count;
-#if OS_UNIX && defined(SQLITE_TEST) && SQLITE_THREADSAFE
+#if SQLITE_OS_UNIX && defined(SQLITE_TEST) && SQLITE_THREADSAFE
   extern int threadsOverrideEachOthersLocks;
 #endif
-#if OS_WIN
+#if SQLITE_OS_WIN
   extern int sqlite3_os_type;
 #endif
 #ifdef SQLITE_DEBUG
@@ -4788,7 +4788,7 @@ int Sqlitetest1_Init(Tcl_Interp *interp){
   Tcl_LinkVar(interp, "unaligned_string_counter",
       (char*)&unaligned_string_counter, TCL_LINK_INT);
 #endif
-#if OS_UNIX && defined(SQLITE_TEST) && SQLITE_THREADSAFE
+#if SQLITE_OS_UNIX && defined(SQLITE_TEST) && SQLITE_THREADSAFE
   Tcl_LinkVar(interp, "threadsOverrideEachOthersLocks",
       (char*)&threadsOverrideEachOthersLocks, TCL_LINK_INT);
 #endif
@@ -4796,7 +4796,7 @@ int Sqlitetest1_Init(Tcl_Interp *interp){
   Tcl_LinkVar(interp, "sqlite_last_needed_collation",
       (char*)&pzNeededCollation, TCL_LINK_STRING|TCL_LINK_READ_ONLY);
 #endif
-#if OS_WIN
+#if SQLITE_OS_WIN
   Tcl_LinkVar(interp, "sqlite_os_type",
       (char*)&sqlite3_os_type, TCL_LINK_INT);
 #endif

src/test4.c

@@ -11,11 +11,11 @@
 *************************************************************************
 ** Code for testing the the SQLite library in a multithreaded environment.
 **
-** $Id: test4.c,v 1.21 2007/08/22 11:41:18 drh Exp $
+** $Id: test4.c,v 1.22 2008/06/26 10:41:19 danielk1977 Exp $
 */
 #include "sqliteInt.h"
 #include "tcl.h"
-#if defined(OS_UNIX) && OS_UNIX==1 && SQLITE_THREADSAFE
+#if defined(SQLITE_OS_UNIX) && OS_UNIX==1 && SQLITE_THREADSAFE
 #include <stdlib.h>
 #include <string.h>
 #include <pthread.h>
@@ -713,4 +713,4 @@ int Sqlitetest4_Init(Tcl_Interp *interp){
 }
 #else
 int Sqlitetest4_Init(Tcl_Interp *interp){ return TCL_OK; }
-#endif /* OS_UNIX */
+#endif /* SQLITE_OS_UNIX */

src/test7.c

@@ -12,7 +12,7 @@
 ** Code for testing the client/server version of the SQLite library.
 ** Derived from test4.c.
 **
-** $Id: test7.c,v 1.10 2007/10/05 15:04:13 danielk1977 Exp $
+** $Id: test7.c,v 1.11 2008/06/26 10:41:19 danielk1977 Exp $
 */
 #include "sqliteInt.h"
 #include "tcl.h"
@@ -22,7 +22,7 @@
 ** the SQLITE_SERVER option.
 */
 #if defined(SQLITE_SERVER) && !defined(SQLITE_OMIT_SHARED_CACHE) && \
-    defined(OS_UNIX) && OS_UNIX && SQLITE_THREADSAFE
+    defined(SQLITE_OS_UNIX) && OS_UNIX && SQLITE_THREADSAFE
 
 #include <stdlib.h>
 #include <string.h>
@@ -720,4 +720,4 @@ int Sqlitetest7_Init(Tcl_Interp *interp){
 }
 #else
 int Sqlitetest7_Init(Tcl_Interp *interp){ return TCL_OK; }
-#endif /* OS_UNIX */
+#endif /* SQLITE_OS_UNIX */

src/test_async.c

@@ -10,7 +10,7 @@
 **
 *************************************************************************
 **
-** $Id: test_async.c,v 1.44 2008/06/06 11:11:26 danielk1977 Exp $
+** $Id: test_async.c,v 1.45 2008/06/26 10:41:19 danielk1977 Exp $
 **
 ** This file contains an example implementation of an asynchronous IO 
 ** backend for SQLite.
@@ -117,7 +117,7 @@
 ** This test uses pthreads and hence only works on unix and with
 ** a threadsafe build of SQLite.
 */
-#if OS_UNIX && SQLITE_THREADSAFE
+#if SQLITE_OS_UNIX && SQLITE_THREADSAFE
 
 /*
 ** This demo uses pthreads.  If you do not have a pthreads implementation
@@ -1696,7 +1696,7 @@ static int testAsyncWait(
 }
 
 
-#endif  /* OS_UNIX and SQLITE_THREADSAFE */
+#endif  /* SQLITE_OS_UNIX and SQLITE_THREADSAFE */
 
 /*
 ** This routine registers the custom TCL commands defined in this
@@ -1704,7 +1704,7 @@ static int testAsyncWait(
 ** of this module.
 */
 int Sqlitetestasync_Init(Tcl_Interp *interp){
-#if OS_UNIX && SQLITE_THREADSAFE
+#if SQLITE_OS_UNIX && SQLITE_THREADSAFE
   Tcl_CreateObjCommand(interp,"sqlite3async_enable",testAsyncEnable,0,0);
   Tcl_CreateObjCommand(interp,"sqlite3async_halt",testAsyncHalt,0,0);
   Tcl_CreateObjCommand(interp,"sqlite3async_delay",testAsyncDelay,0,0);
@@ -1712,6 +1712,6 @@ int Sqlitetestasync_Init(Tcl_Interp *interp){
   Tcl_CreateObjCommand(interp,"sqlite3async_wait",testAsyncWait,0,0);
   Tcl_LinkVar(interp, "sqlite3async_trace",
       (char*)&sqlite3async_trace, TCL_LINK_INT);
-#endif  /* OS_UNIX and SQLITE_THREADSAFE */
+#endif  /* SQLITE_OS_UNIX and SQLITE_THREADSAFE */
   return TCL_OK;
 }

src/test_config.c

@@ -16,7 +16,7 @@
 ** The focus of this file is providing the TCL testing layer
 ** access to compile-time constants.
 **
-** $Id: test_config.c,v 1.28 2008/06/25 14:57:54 danielk1977 Exp $
+** $Id: test_config.c,v 1.29 2008/06/26 10:41:19 danielk1977 Exp $
 */
 
 #include "sqliteLimit.h"
@@ -183,7 +183,7 @@ static void set_options(Tcl_Interp *interp){
   Tcl_SetVar2(interp, "sqlite_options", "conflict", "1", TCL_GLOBAL_ONLY);
 #endif
 
-#if OS_UNIX
+#if SQLITE_OS_UNIX
   Tcl_SetVar2(interp, "sqlite_options", "crashtest", "1", TCL_GLOBAL_ONLY);
 #else
   Tcl_SetVar2(interp, "sqlite_options", "crashtest", "0", TCL_GLOBAL_ONLY);

src/test_server.c

@@ -10,7 +10,7 @@
 **
 ******************************************************************************
 **
-** $Id: test_server.c,v 1.7 2008/05/16 04:51:55 danielk1977 Exp $
+** $Id: test_server.c,v 1.8 2008/06/26 10:41:19 danielk1977 Exp $
 **
 ** This file contains demonstration code.  Nothing in this file gets compiled
 ** or linked into the SQLite library unless you use a non-standard option:
@@ -208,7 +208,7 @@
 ** and only if the SQLITE_SERVER macro is defined.
 */
 #if defined(SQLITE_SERVER) && !defined(SQLITE_OMIT_SHARED_CACHE)
-#if defined(OS_UNIX) && OS_UNIX && SQLITE_THREADSAFE
+#if defined(SQLITE_OS_UNIX) && OS_UNIX && SQLITE_THREADSAFE
 
 /*
 ** We require only pthreads and the public interface of SQLite.
@@ -489,5 +489,5 @@ void sqlite3_server_stop(void){
   pthread_mutex_unlock(&g.serverMutex);
 }
 
-#endif /* defined(OS_UNIX) && OS_UNIX && SQLITE_THREADSAFE */
+#endif /* defined(SQLITE_OS_UNIX) && OS_UNIX && SQLITE_THREADSAFE */
 #endif /* defined(SQLITE_SERVER) */

tool/omittest.tcl

@@ -1,5 +1,5 @@
 
-set rcsid {$Id: omittest.tcl,v 1.3 2007/09/14 16:20:01 danielk1977 Exp $}
+set rcsid {$Id: omittest.tcl,v 1.4 2008/06/26 10:41:19 danielk1977 Exp $}
 
 # Documentation for this script. This may be output to stderr
 # if the script is invoked incorrectly.
@@ -47,7 +47,7 @@ they do not respect the OPTS variable.
 #
 proc run_quick_test {dir omit_symbol_list} {
   # Compile the value of the OPTS Makefile variable.
-  set opts "-DSQLITE_MEMDEBUG=2 -DSQLITE_DEBUG -DOS_UNIX" 
+  set opts "-DSQLITE_MEMDEBUG=2 -DSQLITE_DEBUG -DSQLITE_OS_UNIX" 
   foreach sym $omit_symbol_list {
     append opts " -D${sym}=1"
   }

tool/soak1.tcl

@@ -78,7 +78,7 @@ scenario 2 {Everything} {
 }
 scenario 3 {Customer-1} {
   SQLITE_DEBUG=1 SQLITE_MEMDEBUG=1
-  THREADSAFE=1 OS_UNIX=1
+  THREADSAFE=1 SQLITE_OS_UNIX=1
   SQLITE_DISABLE_LFS=1
   SQLITE_DEFAULT_AUTOVACUUM=1
   SQLITE_DEFAULT_PAGE_SIZE=1024
@@ -93,7 +93,7 @@ scenario 3 {Customer-1} {
 }
 scenario 4 {Small-Cache} {
   SQLITE_DEBUG=1 SQLITE_MEMDEBUG=1
-  THREADSAFE=1 OS_UNIX=1
+  THREADSAFE=1 SQLITE_OS_UNIX=1
   SQLITE_DEFAULT_AUTOVACUUM=1
   SQLITE_DEFAULT_PAGE_SIZE=1024
   SQLITE_MAX_PAGE_SIZE=2048