From: pweilbacher <pweilbacher@noemail.net>
Date: Fri, 22 Jun 2007 20:04:36 +0000 (+0000)
Subject: fix compilation failure on OS/2 with the amalgamation (CVS 4109)
X-Git-Tag: version-3.4.1~61
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=691902e7d6f1aa3b1eb3405041a8d0d0455c5794;p=thirdparty%2Fsqlite.git

fix compilation failure on OS/2 with the amalgamation (CVS 4109)

FossilOrigin-Name: 12327ca049e62922bfb3c2a14e42554fd58265e8
---

diff --git a/manifest b/manifest
index 943c9da09b..7a538331f4 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Extend\sfts2\sso\sthat\suser\sdefined\stokenizers\smay\sbe\sadded.\sAdd\sa\stokenizer\sthat\suses\sthe\sICU\slibrary\sif\savailable.\sDocumentation\sand\stests\sto\scome.\s(CVS\s4108)
-D 2007-06-22T15:21:16
+C fix\scompilation\sfailure\son\sOS/2\swith\sthe\samalgamation\s(CVS\s4109)
+D 2007-06-22T20:04:37
 F Makefile.in 7f7485a4cc039476a42e534b3f26ec90e2f9753e
 F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -86,7 +86,7 @@ F src/main.c 65fc7de0b3c2e5b637c000ecf419c35de2525ef9
 F src/malloc.c fa9bbccc4e6d099cd04c2518d238a1669c9d1020
 F src/md5.c c5fdfa5c2593eaee2e32a5ce6c6927c986eaf217
 F src/os.c 1f10b47acc1177fb9225edb4f5f0d25ed716f9cb
-F src/os.h 213dd1f8f7ab9159c04a893eadc0cdd52515df16
+F src/os.h 478f38ee534e9620540982cd5110b6637a569296
 F src/os_common.h a38233cd3b1f260db6f01f1093295d5708130065
 F src/os_os2.c 2ce97909b926a598823f97338027dbec1dcf4165
 F src/os_os2.h e5f17dd69333632bbc3112881ea407c37d245eb3
@@ -512,7 +512,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P 2dafe08a91b5328a9d0df5ab29c3ff2d94ad5f6f
-R c1366eff2872139d79721716582129d6
-U danielk1977
-Z 5d0863f4b162f005704998d90939d28f
+P 68677e420c744b39ea9d7399819e0f376748886d
+R 14309e1f88e8dc11bc579389b462f1f8
+U pweilbacher
+Z 308a7f4a2b7f476d0e17fda9459f3b91
diff --git a/manifest.uuid b/manifest.uuid
index 7366ee1df0..b5fa1f067e 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-68677e420c744b39ea9d7399819e0f376748886d
\ No newline at end of file
+12327ca049e62922bfb3c2a14e42554fd58265e8
\ No newline at end of file
diff --git a/src/os.h b/src/os.h
index c70180ddea..2772245c5c 100644
--- a/src/os.h
+++ b/src/os.h
@@ -72,6 +72,7 @@
 # define INCL_DOSERRORS
 # define INCL_DOSMISC
 # define INCL_DOSPROCESS
+# define INCL_DOSMODULEMGR
 # include <os2.h>
 # define SQLITE_TEMPNAME_SIZE (CCHMAXPATHCOMP)
 #else