Fix OS/2 compilation for pre-C99 compilers. (CVS 5150)

FossilOrigin-Name: de8e67182d8f9d1f0b215da93a396b9467604a50

diff --git a/manifest b/manifest
index a78857a4c08137c5ca617fc9e4e4bfd653fa2572..cbfbfb8cbf61205daba3639e747ee48f662e7d9c 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Corrections\sto\sthe\sdocumented\sbehavior\sof\ssqlite3_last_insert_rowid().\n(This\schange\sis\sunrelated\sto\sthe\sproblem\sreported\sby\sBram\sde\sJong.\s\sThat\ncomes\snext.)\s(CVS\s5149)
-D 2008-05-20T18:43:38
+C Fix\sOS/2\scompilation\sfor\spre-C99\scompilers.\s(CVS\s5150)
+D 2008-05-20T19:08:54
 F Makefile.arm-wince-mingw32ce-gcc ac5f7b2cef0cd850d6f755ba6ee4ab961b1fadf7
 F Makefile.in 79aeba12300a54903f1b1257c1e7c190234045dd
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -118,7 +118,7 @@ F src/mutex_w32.c 133698096a2c4e81cd11ea6f4de7891c66f7b9f7
 F src/os.c 9348e092f3ac2c964491b01424a17862e0650e86
 F src/os.h 7131c5b8e5cd59504d3818f88e4ae106da8fac01
 F src/os_common.h 9da7339466404707af49943fe4c47e608034761b
-F src/os_os2.c afb7ce54dab1725656cec92f289b24ad8e2b39ba
+F src/os_os2.c 1578149e21c4eac42c7f230a6f40500846f8e781
 F src/os_unix.c 06dceb3230249d6e7c6a1d8d602fa6a93f4085b9
 F src/os_win.c 3b0a31c598dcafada283368f2a7f7bb3fd78b26b
 F src/pager.c baf3c74d8add102e83bae06f34644e8a50f4928d
@@ -636,7 +636,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P a0376c7907db8e2993ce48e484001e981fbbb187
-R 41897067ca76c4aab67af0416a4c9951
-U drh
-Z d730ec45afb5132bb2647dd3d3555a41
+P 894085a59cdc60c34c8a3eb560d98bcb4a087cb1
+R 9cd012b9b6638413801262c433fecb94
+U pweilbacher
+Z d561cc78f2b3ec86435123f580dbcd83

diff --git a/manifest.uuid b/manifest.uuid
index 4bed4eec8f161b4caff0f3b0fd797267f4709df3..2b6fdf0e371d773c7ae82e2bce852a8d2547e8e4 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-894085a59cdc60c34c8a3eb560d98bcb4a087cb1
\ No newline at end of file
+de8e67182d8f9d1f0b215da93a396b9467604a50
\ No newline at end of file

diff --git a/src/os_os2.c b/src/os_os2.c
index d85102767e74320096f0dd27b90b1d4366afc872..348bcf5ea577d4ee4165db6caea8ee1d2d2639c5 100644 (file)
--- a/src/os_os2.c
+++ b/src/os_os2.c
@@ -12,7 +12,7 @@
 **
 ** This file contains code that is specific to OS/2.
 **
-** $Id: os_os2.c,v 1.39 2008/05/16 04:51:55 danielk1977 Exp $
+** $Id: os_os2.c,v 1.40 2008/05/20 19:08:54 pweilbacher Exp $
 */
 
 #include "sqliteInt.h"
@@ -649,6 +649,7 @@ static int os2Open(
   os2File *pFile = (os2File*)id;
   APIRET rc = NO_ERROR;
   ULONG ulAction;
+  char *zNameCp;
 
   memset( pFile, 0, sizeof(*pFile) );
 
@@ -700,7 +701,7 @@ static int os2Open(
   ulOpenMode |= OPEN_FLAGS_FAIL_ON_ERROR;
   ulOpenMode |= OPEN_FLAGS_NOINHERIT;
 
-  char *zNameCp = convertUtf8PathToCp( zName );
+  zNameCp = convertUtf8PathToCp( zName );
   rc = DosOpen( (PSZ)zNameCp,
                 &h,
                 &ulAction,