Updates to the OS/2 patches. This change also move the location of a global

variable declaration in shell.c which might effect other build targets.

FossilOrigin-Name: 73906b67dc920e0c36e68ef9a302be3b495e8e3a

diff --git a/manifest b/manifest
index ed519194ff046f5ab59f02b6f68daab5c8d9f3ad..09cdbe394ad7e66890d7f8b1cfc29ba96d0af768 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\ssigned\sinteger\soverflow\sproblem\sin\sthe\stestcase()\smacro.
-D 2011-04-11T15:35:24.214
+C Updates\sto\sthe\sOS/2\spatches.\s\sThis\schange\salso\smove\sthe\slocation\sof\sa\sglobal\nvariable\sdeclaration\sin\sshell.c\swhich\smight\seffect\sother\sbuild\stargets.
+D 2011-04-11T15:36:26.429
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 7a4d9524721d40ef9ee26f93f9bd6a51dba106f2
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -154,14 +154,14 @@ F src/memjournal.c 0ebce851677a7ac035ba1512a7e65851b34530c6
 F src/mutex.c 6949180803ff05a7d0e2b9334a95b4fb5a00e23f
 F src/mutex.h fe2ef5e1c4dae531d5a544f9241f19c56d26803d
 F src/mutex_noop.c d5cfbca87168c661a0b118cd8e329a908e453151
-F src/mutex_os2.c f5d09e85b914643c230aa97db709fc0db370d93c
+F src/mutex_os2.c 882d735098c07c8c6a5472b8dd66e19675fe117f
 F src/mutex_unix.c b4f4e923bb8de93ec3f251fadb50855f23df9579
 F src/mutex_w32.c 5e54f3ba275bcb5d00248b8c23107df2e2f73e33
 F src/notify.c 976dd0f6171d4588e89e874fcc765e92914b6d30
 F src/os.c 22ac61d06e72a0dac900400147333b07b13d8e1d
 F src/os.h 9dbed8c2b9c1f2f2ebabc09e49829d4777c26bf9
 F src/os_common.h a8f95b81eca8a1ab8593d23e94f8a35f35d4078f
-F src/os_os2.c e435657f40934ac740131bb5ac7782385195d35b
+F src/os_os2.c 4a75888ba3dfc820ad5e8177025972d74d7f2440
 F src/os_unix.c a8fe62148d41e54e383d3360a711a01595feef58
 F src/os_win.c 24d72407a90551969744cf9bcbb1b4c72c5fa845
 F src/pager.c 055239dcdfe12b3f5d97f6f01f85da01e2d6d912
@@ -177,7 +177,7 @@ F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
 F src/resolve.c 1c0f32b64f8e3f555fe1f732f9d6f501a7f05706
 F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697
 F src/select.c 649a6f10f7eb7b52a5a28847773cb9968a828ae8
-F src/shell.c 9c8389796764f65d4506bcd614ac8061f4160d5c
+F src/shell.c 72e7e176bf46d5c6518d15ac4ad6847c4bb5df79
 F src/sqlite.h.in 4d28db70c37a1b17942820308eb59f211140da43
 F src/sqlite3ext.h c90bd5507099f62043832d73f6425d8d5c5da754
 F src/sqliteInt.h ac8f3f5846275c634f6649969304a9e97f6f9854
@@ -929,7 +929,7 @@ F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P eac17106808fa54551a18ff9b44f8370cb5d7160
-R d44347ec02323fa37cbf17f2ff67c885
+P f18f5f5893a0d37ecedcfcfdddbe06cdbe0b4243
+R c8181928c3ceb1c71c7c8d428b56d445
 U drh
-Z f4f7a1aeb3f45e4542cc6dbfb2e2ce5e
+Z e89a36f6abc00bf0be3e1bd386e9919f

diff --git a/manifest.uuid b/manifest.uuid
index 27893fd7a52e8ffc68fc4ca06e1a247c0f8053d1..525dc9dae3ff84f0db7595b6eb30f42dd8335df0 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f18f5f5893a0d37ecedcfcfdddbe06cdbe0b4243
\ No newline at end of file
+73906b67dc920e0c36e68ef9a302be3b495e8e3a
\ No newline at end of file

diff --git a/src/mutex_os2.c b/src/mutex_os2.c
index 85129f3e48b942af790e303828f9c8f7db118867..ce650d994e3c74582f9fb9e9c0a898c470f8c31d 100644 (file)
--- a/src/mutex_os2.c
+++ b/src/mutex_os2.c
@@ -251,7 +251,7 @@ static void os2MutexLeave(sqlite3_mutex *p){
 #endif
 }
 
-SQLITE_PRIVATE sqlite3_mutex_methods const *sqlite3DefaultMutex(void){
+sqlite3_mutex_methods const *sqlite3DefaultMutex(void){
   static const sqlite3_mutex_methods sMutex = {
     os2MutexInit,
     os2MutexEnd,

diff --git a/src/os_os2.c b/src/os_os2.c
index c3dd68f712d5c44d473fec62cce09ebbf717602e..487ac3c3c8130b24d93cfc8c131c5ea8772514aa 100644 (file)
--- a/src/os_os2.c
+++ b/src/os_os2.c
@@ -1837,7 +1837,7 @@ static int os2CurrentTimeInt64(sqlite3_vfs *pVfs, sqlite3_int64 *piNow){
 ** current time and date as a Julian Day number into *prNow and
 ** return 0.  Return 1 if the time and date cannot be found.
 */
-int os2CurrentTime( sqlite3_vfs *pVfs, double *prNow ){
+static int os2CurrentTime( sqlite3_vfs *pVfs, double *prNow ){
   int rc;
   sqlite3_int64 i;
   rc = os2CurrentTimeInt64(pVfs, &i);

diff --git a/src/shell.c b/src/shell.c
index 4f34ccceb6c88523098414b0d6863dbdf935437c..aab70b29db45a244fe78bd11101f6902e8b235ba 100644 (file)
--- a/src/shell.c
+++ b/src/shell.c
@@ -71,6 +71,9 @@ extern int isatty();
 #define isatty(x) 1
 #endif
 
+/* True if the timer is enabled */
+static int enableTimer = 0;
+
 #if !defined(_WIN32) && !defined(WIN32) && !defined(__OS2__) && !defined(__RTP__) && !defined(_WRS_KERNEL)
 #include <sys/time.h>
 #include <sys/resource.h>
@@ -78,9 +81,6 @@ extern int isatty();
 /* Saved resource information for the beginning of an operation */
 static struct rusage sBegin;
 
-/* True if the timer is enabled */
-static int enableTimer = 0;
-
 /*
 ** Begin timing an operation
 */
@@ -124,9 +124,6 @@ static FILETIME ftUserBegin;
 typedef BOOL (WINAPI *GETPROCTIMES)(HANDLE, LPFILETIME, LPFILETIME, LPFILETIME, LPFILETIME);
 static GETPROCTIMES getProcessTimesAddr = NULL;
 
-/* True if the timer is enabled */
-static int enableTimer = 0;
-
 /*
 ** Check to see if we have timer support.  Return 1 if necessary
 ** support found (or found previously).