From: mistachkin <mistachkin@noemail.net>
Date: Thu, 21 Jun 2012 15:09:20 +0000 (+0000)
Subject: Remove more references to OS/2.
X-Git-Tag: version-3.7.14~76
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f1c6bc5cd3552772bf749df91ffeee2d37f62d1f;p=thirdparty%2Fsqlite.git

Remove more references to OS/2.

FossilOrigin-Name: eebd594d6bd09c77727620a818d7dc0b091f55b4
---

diff --git a/Makefile.msc b/Makefile.msc
index a80db8c638..c42f949d6e 100644
--- a/Makefile.msc
+++ b/Makefile.msc
@@ -303,8 +303,8 @@ LIBOBJS0 = alter.lo analyze.lo attach.lo auth.lo \
          icu.lo insert.lo journal.lo legacy.lo loadext.lo \
          main.lo malloc.lo mem0.lo mem1.lo mem2.lo mem3.lo mem5.lo \
          memjournal.lo \
-         mutex.lo mutex_noop.lo mutex_os2.lo mutex_unix.lo mutex_w32.lo \
-         notify.lo opcodes.lo os.lo os_os2.lo os_unix.lo os_win.lo \
+         mutex.lo mutex_noop.lo mutex_unix.lo mutex_w32.lo \
+         notify.lo opcodes.lo os.lo os_unix.lo os_win.lo \
          pager.lo parse.lo pcache.lo pcache1.lo pragma.lo prepare.lo printf.lo \
          random.lo resolve.lo rowset.lo rtree.lo select.lo status.lo \
          table.lo tokenize.lo trigger.lo \
@@ -366,14 +366,12 @@ SRC = \
   $(TOP)\src\mutex.c \
   $(TOP)\src\mutex.h \
   $(TOP)\src\mutex_noop.c \
-  $(TOP)\src\mutex_os2.c \
   $(TOP)\src\mutex_unix.c \
   $(TOP)\src\mutex_w32.c \
   $(TOP)\src\notify.c \
   $(TOP)\src\os.c \
   $(TOP)\src\os.h \
   $(TOP)\src\os_common.h \
-  $(TOP)\src\os_os2.c \
   $(TOP)\src\os_unix.c \
   $(TOP)\src\os_win.c \
   $(TOP)\src\pager.c \
@@ -535,7 +533,6 @@ TESTSRC2 = \
   $(TOP)\src\wal.c \
   $(TOP)\src\mem5.c \
   $(TOP)\src\os.c \
-  $(TOP)\src\os_os2.c \
   $(TOP)\src\os_unix.c \
   $(TOP)\src\os_win.c \
   $(TOP)\src\pager.c \
@@ -776,9 +773,6 @@ mutex.lo:	$(TOP)\src\mutex.c $(HDR)
 mutex_noop.lo:	$(TOP)\src\mutex_noop.c $(HDR)
 	$(LTCOMPILE) -c $(TOP)\src\mutex_noop.c
 
-mutex_os2.lo:	$(TOP)\src\mutex_os2.c $(HDR)
-	$(LTCOMPILE) -c $(TOP)\src\mutex_os2.c
-
 mutex_unix.lo:	$(TOP)\src\mutex_unix.c $(HDR)
 	$(LTCOMPILE) -c $(TOP)\src\mutex_unix.c
 
@@ -806,9 +800,6 @@ os_unix.lo:	$(TOP)\src\os_unix.c $(HDR)
 os_win.lo:	$(TOP)\src\os_win.c $(HDR)
 	$(LTCOMPILE) -c $(TOP)\src\os_win.c
 
-os_os2.lo:	$(TOP)\src\os_os2.c $(HDR)
-	$(LTCOMPILE) -c $(TOP)\src\os_os2.c
-
 pragma.lo:	$(TOP)\src\pragma.c $(HDR)
 	$(LTCOMPILE) -c $(TOP)\src\pragma.c
 
diff --git a/Makefile.vxworks b/Makefile.vxworks
index 4398c18265..25bc853943 100644
--- a/Makefile.vxworks
+++ b/Makefile.vxworks
@@ -204,8 +204,8 @@ LIBOBJ+= alter.o analyze.o attach.o auth.o \
          icu.o insert.o journal.o legacy.o loadext.o \
          main.o malloc.o mem0.o mem1.o mem2.o mem3.o mem5.o \
          memjournal.o \
-         mutex.o mutex_noop.o mutex_os2.o mutex_unix.o mutex_w32.o \
-         notify.o opcodes.o os.o os_os2.o os_unix.o os_win.o \
+         mutex.o mutex_noop.o mutex_unix.o mutex_w32.o \
+         notify.o opcodes.o os.o os_unix.o os_win.o \
          pager.o parse.o pcache.o pcache1.o pragma.o prepare.o printf.o \
          random.o resolve.o rowset.o rtree.o select.o status.o \
          table.o tokenize.o trigger.o \
@@ -256,14 +256,12 @@ SRC = \
   $(TOP)/src/mutex.c \
   $(TOP)/src/mutex.h \
   $(TOP)/src/mutex_noop.c \
-  $(TOP)/src/mutex_os2.c \
   $(TOP)/src/mutex_unix.c \
   $(TOP)/src/mutex_w32.c \
   $(TOP)/src/notify.c \
   $(TOP)/src/os.c \
   $(TOP)/src/os.h \
   $(TOP)/src/os_common.h \
-  $(TOP)/src/os_os2.c \
   $(TOP)/src/os_unix.c \
   $(TOP)/src/os_win.c \
   $(TOP)/src/pager.c \
@@ -396,7 +394,7 @@ TESTSRC2 = \
   $(TOP)/src/attach.c $(TOP)/src/backup.c $(TOP)/src/btree.c                   \
   $(TOP)/src/build.c $(TOP)/src/ctime.c $(TOP)/src/date.c                      \
   $(TOP)/src/expr.c $(TOP)/src/func.c $(TOP)/src/insert.c $(TOP)/src/os.c      \
-  $(TOP)/src/os_os2.c $(TOP)/src/os_unix.c $(TOP)/src/os_win.c                 \
+  $(TOP)/src/os_unix.c $(TOP)/src/os_win.c                 \
   $(TOP)/src/pager.c $(TOP)/src/pragma.c $(TOP)/src/prepare.c                  \
   $(TOP)/src/printf.c $(TOP)/src/random.c $(TOP)/src/pcache.c                  \
   $(TOP)/src/pcache1.c $(TOP)/src/select.c $(TOP)/src/tokenize.c               \
diff --git a/manifest b/manifest
index 12d02fcd2c..1e64ec685c 100644
--- a/manifest
+++ b/manifest
@@ -1,10 +1,10 @@
-C Increase\sthe\sversion\snumber\sto\s3.7.14\sand\srerun\sautoconf
-D 2012-06-21T14:31:40.163
+C Remove\smore\sreferences\sto\sOS/2.
+D 2012-06-21T15:09:20.823
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 8f6d858bf3df9978ba43df19985146a1173025e4
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
-F Makefile.msc e893726c32ff402760eea125c7baaf928ed24257
-F Makefile.vxworks 3b7fe7a0571fdadc61363ebc1b23732d2d6363ca
+F Makefile.msc 0100213e86c66ed5ac37ea98446406c06f012203
+F Makefile.vxworks 879f034a64062a364b21000266bbd5bc6e0c19b9
 F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
 F VERSION a71848df48082f1d6585d4b0819d530fc455485d
 F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@ -178,7 +178,7 @@ F src/resolve.c b3c70ab28cac60de33684c9aa9e5138dcf71d6dd
 F src/rowset.c f6a49f3e9579428024662f6e2931832511f831a1
 F src/select.c f6c4833c4d8e94714761d99013d74f381e084f1d
 F src/shell.c 74e47ddb99bf7997985dc89bbdd5875637501ad1
-F src/sqlite.h.in 39f041ce71a0d994e2487014fc9e8721595f5bc0
+F src/sqlite.h.in 34640d183e570e81ae1e057a668fdbb55625e802
 F src/sqlite3ext.h 6904f4aadf976f95241311fbffb00823075d9477
 F src/sqliteInt.h aedc97651f686dccebd8a5c742835a2a5e8e99c0
 F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
@@ -566,7 +566,7 @@ F test/laststmtchanges.test ae613f53819206b3222771828d024154d51db200
 F test/like.test 7b4aaa4a8192fdec90e0a905984c92a688c51e48
 F test/like2.test 3b2ee13149ba4a8a60b59756f4e5d345573852da
 F test/limit.test 2db7b3b34fb925b8e847d583d2eb67531d0ce67e
-F test/loadext.test dab17f7014f8079698dbd4b02705562b0ce6db5f
+F test/loadext.test 2b5e249c51c986a5aff1f0950cf7ba30976c8f22
 F test/loadext2.test 0bcaeb4d81cd5b6e883fdfea3c1bdbe1f173cbca
 F test/lock.test db74fdf5a73bad29ab3d862ea78bf1068972cc1d
 F test/lock2.test 5242d8ac4e2d59c403aebff606af449b455aceff
@@ -616,7 +616,7 @@ F test/misc3.test fe55130a43e444ee75e2156ff75dc96e964b5738
 F test/misc4.test 9c078510fbfff05a9869a0b6d8b86a623ad2c4f6
 F test/misc5.test 528468b26d03303b1f047146e5eefc941b9069f5
 F test/misc6.test 953cc693924d88e6117aeba16f46f0bf5abede91
-F test/misc7.test 4337d84e441f36cee62656f9f7ba8bc22a7ca721
+F test/misc7.test f00dad9a004da659330013e6f21819d018b683d3
 F test/misuse.test ba4fb5d1a6101d1c171ea38b3c613d0661c83054
 F test/multiplex.test e08cc7177bd6d85990ee1d71100bb6c684c02256
 F test/multiplex2.test 580ca5817c7edbe4cc68fa150609c9473393003a
@@ -657,7 +657,7 @@ F test/randexpr1.test eda062a97e60f9c38ae8d806b03b0ddf23d796df
 F test/rdonly.test c267d050a1d9a6a321de502b737daf28821a518d
 F test/reindex.test 44edd3966b474468b823d481eafef0c305022254
 F test/releasetest.mk 2eced2f9ae701fd0a29e714a241760503ccba25a
-F test/releasetest.tcl fa302d03fd9acfce6d910553a33473bfcf561958
+F test/releasetest.tcl 4014e2bfb93f276d82a604e7a5eda62c129916c9
 F test/rollback.test a1b4784b864331eae8b2a98c189efa2a8b11ff07
 F test/rowhash.test 0bc1d31415e4575d10cacf31e1a66b5cc0f8be81
 F test/rowid.test e58e0acef38b527ed1b0b70d3ada588f804af287
@@ -977,12 +977,12 @@ F tool/lempar.c 01ca97f87610d1dac6d8cd96ab109ab1130e76dc
 F tool/mkkeywordhash.c bb52064aa614e1426445e4b2b9b00eeecd23cc79
 F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e
 F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
-F tool/mksqlite3c-noext.tcl 105023aa86f696a74b1d6a4929d1e1c3baf9471c
+F tool/mksqlite3c-noext.tcl 8bce31074e4cbe631bb7676526a048335f4c9f02
 F tool/mksqlite3c.tcl 589c7f44e990be1b8443cfe4808dce392b0327fa
 F tool/mksqlite3h.tcl 78013ad79a5e492e5f764f3c7a8ef834255061f8
-F tool/mksqlite3internalh.tcl 7b43894e21bcb1bb39e11547ce7e38a063357e87
+F tool/mksqlite3internalh.tcl 3dca7bb5374cee003379b8cbac73714f610ef795
 F tool/offsets.c fe4262fdfa378e8f5499a42136d17bf3b98f6091
-F tool/omittest.tcl 72a49b8a9a8b0bf213a438180307a0df836d4380
+F tool/omittest.tcl 4665982e95a6e5c1bd806cf7bc3dea95be422d77
 F tool/opcodeDoc.awk b3a2a3d5d3075b8bd90b7afe24283efdd586659c
 F tool/restore_jrnl.tcl 6957a34f8f1f0f8285e07536225ec3b292a9024a
 F tool/rollback-test.c 9fc98427d1e23e84429d7e6d07d9094fbdec65a5
@@ -1004,7 +1004,7 @@ F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
-P b80bc52f8964569f948c5671e9d58e4d199a08dc
-R d9c7ca44b5bae5cf9a1d5fac839a060e
-U drh
-Z 9bb5699eedb76c21c7cf92db7d26e31a
+P 8c9f564a2a07603f1852ccb45089fe84591cf68f
+R fcffc83b93b7e49de73883c31a2c7d5e
+U mistachkin
+Z 5f63191d32609910374c52c28186aa72
diff --git a/manifest.uuid b/manifest.uuid
index 8f13b9be82..052ef8fa2a 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-8c9f564a2a07603f1852ccb45089fe84591cf68f
\ No newline at end of file
+eebd594d6bd09c77727620a818d7dc0b091f55b4
\ No newline at end of file
diff --git a/src/sqlite.h.in b/src/sqlite.h.in
index f273937ca5..ea36673ad3 100644
--- a/src/sqlite.h.in
+++ b/src/sqlite.h.in
@@ -5489,7 +5489,6 @@ int sqlite3_vfs_unregister(sqlite3_vfs*);
 ** implementations are available in the SQLite core:
 **
 ** <ul>
-** <li>   SQLITE_MUTEX_OS2
 ** <li>   SQLITE_MUTEX_PTHREADS
 ** <li>   SQLITE_MUTEX_W32
 ** <li>   SQLITE_MUTEX_NOOP
@@ -5497,9 +5496,9 @@ int sqlite3_vfs_unregister(sqlite3_vfs*);
 **
 ** ^The SQLITE_MUTEX_NOOP implementation is a set of routines
 ** that does no real locking and is appropriate for use in
-** a single-threaded application.  ^The SQLITE_MUTEX_OS2,
-** SQLITE_MUTEX_PTHREADS, and SQLITE_MUTEX_W32 implementations
-** are appropriate for use on OS/2, Unix, and Windows.
+** a single-threaded application.  ^The SQLITE_MUTEX_PTHREADS and
+** SQLITE_MUTEX_W32 implementations are appropriate for use on Unix
+** and Windows.
 **
 ** ^(If SQLite is compiled with the SQLITE_MUTEX_APPDEF preprocessor
 ** macro defined (with "-DSQLITE_MUTEX_APPDEF=1"), then no mutex
diff --git a/test/loadext.test b/test/loadext.test
index 8f8339ecb3..72eff12f7a 100644
--- a/test/loadext.test
+++ b/test/loadext.test
@@ -23,7 +23,7 @@ ifcapable !load_ext {
 
 # The name of the test extension varies by operating system.
 #
-if {$::tcl_platform(platform) eq "windows" || $::tcl_platform(platform) eq "os2"} {
+if {$::tcl_platform(platform) eq "windows"} {
   set testextension ./testloadext.dll
 } else {
   set testextension ./libtestloadext.so
diff --git a/test/misc7.test b/test/misc7.test
index 146dca0412..4868c12ac0 100644
--- a/test/misc7.test
+++ b/test/misc7.test
@@ -377,7 +377,7 @@ do_test misc7-16.X {
 # These tests do not work on windows due to restrictions in the
 # windows file system.
 #
-if {$tcl_platform(platform)!="windows" && $tcl_platform(platform)!="os2"} {
+if {$tcl_platform(platform)!="windows"} {
 
   # Some network filesystems (ex: AFP) do not support setting read-only
   # permissions.  Only run these tests if full unix permission setting
diff --git a/test/releasetest.tcl b/test/releasetest.tcl
index 7725630187..83377d6fa2 100644
--- a/test/releasetest.tcl
+++ b/test/releasetest.tcl
@@ -218,8 +218,6 @@ proc run_test_suite {name testtarget config} {
 
   if {$::tcl_platform(platform)=="windows"} {
     append opts " -DSQLITE_OS_WIN=1"
-  } elseif {$::tcl_platform(platform)=="os2"} {
-    append opts " -DSQLITE_OS_OS2=1"
   } else {
     append opts " -DSQLITE_OS_UNIX=1"
   }
diff --git a/tool/mksqlite3c-noext.tcl b/tool/mksqlite3c-noext.tcl
index 6ad30237c6..017ad6292f 100644
--- a/tool/mksqlite3c-noext.tcl
+++ b/tool/mksqlite3c-noext.tcl
@@ -100,7 +100,6 @@ foreach hdr {
    opcodes.h
    os_common.h
    os.h
-   os_os2.h
    pager.h
    parse.h
    pcache.h
@@ -233,7 +232,6 @@ foreach file {
    mem5.c
    mutex.c
    mutex_noop.c
-   mutex_os2.c
    mutex_unix.c
    mutex_w32.c
    malloc.c
@@ -244,7 +242,6 @@ foreach file {
    hash.c
    opcodes.c
 
-   os_os2.c
    os_unix.c
    os_win.c
 
diff --git a/tool/mksqlite3internalh.tcl b/tool/mksqlite3internalh.tcl
index f02a62df73..406ef5c457 100644
--- a/tool/mksqlite3internalh.tcl
+++ b/tool/mksqlite3internalh.tcl
@@ -61,7 +61,6 @@ foreach hdr {
    opcodes.h
    os_common.h
    os.h
-   os_os2.h
    pager.h
    parse.h
    sqlite3ext.h
diff --git a/tool/omittest.tcl b/tool/omittest.tcl
index 7f13a4cbe3..3351b96b32 100644
--- a/tool/omittest.tcl
+++ b/tool/omittest.tcl
@@ -53,8 +53,6 @@ proc run_quick_test {dir omit_symbol_list} {
   if {$::tcl_platform(platform)=="windows"} {
     append opts "OPTS += -DSQLITE_OS_WIN=1\n"
     set target "testfixture.exe"
-  } elseif {$::tcl_platform(platform)=="os2"} {
-    append opts "OPTS += -DSQLITE_OS_OS2=1\n"
   } else {
     append opts "OPTS += -DSQLITE_OS_UNIX=1\n"
   }
@@ -93,7 +91,7 @@ proc run_quick_test {dir omit_symbol_list} {
   # of trying to build the sqlite shell. The sqlite shell won't build 
   # with some of the OMIT options (i.e OMIT_COMPLETE).
   set sqlite3_dummy $dir/sqlite3
-  if {$::tcl_platform(platform)=="windows" || $::tcl_platform(platform)=="os2"} {
+  if {$::tcl_platform(platform)=="windows"} {
     append sqlite3_dummy ".exe"
   }
   if {![file exists $sqlite3_dummy]} {
@@ -127,8 +125,8 @@ proc run_quick_test {dir omit_symbol_list} {
 #
 proc process_options {argv} {
   set ::MAKEBIN make                        ;# Default value
-  if {$::tcl_platform(platform)=="windows" || $::tcl_platform(platform)=="os2"} {
-    set ::MAKEFILE ./Makefile               ;# Default value on Windows and OS2
+  if {$::tcl_platform(platform)=="windows"} {
+    set ::MAKEFILE ./Makefile               ;# Default value on Windows
   } else {
     set ::MAKEFILE ./Makefile.linux-gcc     ;# Default value
   }