Add back in some #includes that were removed incorrectly by the

previous check-in.

FossilOrigin-Name: 718905367ff3f86a449c2c27f724089ba31dea3a

diff --git a/manifest b/manifest
index 010e2bf8883a34d0659e6d10f903164427547b6a..598e97887678917bfb97a0b694c77027c66ed529 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\sunused\s#defines\sfrom\sos.h.
-D 2012-03-01T18:16:48.199
+C Add\sback\sin\ssome\s#includes\sthat\swere\sremoved\sincorrectly\sby\sthe\nprevious\scheck-in.
+D 2012-03-01T19:14:13.642
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 3f79a373e57c3b92dabf76f40b065e719d31ac34
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -163,7 +163,7 @@ F src/mutex_unix.c c3a4e00f96ba068a8dbef34084465979aaf369cc
 F src/mutex_w32.c 5e54f3ba275bcb5d00248b8c23107df2e2f73e33
 F src/notify.c 976dd0f6171d4588e89e874fcc765e92914b6d30
 F src/os.c e1acdc09ff3ac2412945cca9766e2dcf4675f31c
-F src/os.h 3b152a1b6d426228c1d10d75cdcc7adcc89b8e8c
+F src/os.h a8c6a8aeda6c9a1b1deea675aa79bae82fa7c15f
 F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
 F src/os_os2.c 4a75888ba3dfc820ad5e8177025972d74d7f2440
 F src/os_unix.c 0e3d2942d228d0366fb80a3640f35caf413b66d1
@@ -991,7 +991,7 @@ F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings-clang.sh 9f406d66e750e8ac031c63a9ef3248aaa347ef2a
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
-P 16330a2f7262173a32ae48a72c0ee2522b6dc554
-R dcd6f3533b75ce35c1c4bbf3bf0513ac
+P c0891296b49fb95917db8a881425f8131cbf6de7
+R 6e4cb882ea93ae9339007a493ca76cc2
 U drh
-Z bd5dc6273ea797f2f01bb9f1d730a750
+Z 1990475c2c72ee94b7f89b5294ac0476

diff --git a/manifest.uuid b/manifest.uuid
index 310ebb570223ac761e2ce662ff13d260432523d3..fa815bb210031135e9c95a778086f1c75a288c5b 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c0891296b49fb95917db8a881425f8131cbf6de7
\ No newline at end of file
+718905367ff3f86a449c2c27f724089ba31dea3a
\ No newline at end of file

diff --git a/src/os.h b/src/os.h
index 5ccb442f1fdc72db2f4cd4c7a15767071e1de5b2..cf0530447e7b94d5f7b5985080b053618b415a46 100644 (file)
--- a/src/os.h
+++ b/src/os.h
@@ -65,6 +65,25 @@
 # endif
 #endif
 
+#if SQLITE_OS_WIN
+# include <windows.h>
+#endif
+
+#if 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
+# define INCL_DOSDATETIME
+# define INCL_DOSFILEMGR
+# define INCL_DOSERRORS
+# define INCL_DOSMISC
+# define INCL_DOSPROCESS
+# define INCL_DOSMODULEMGR
+# define INCL_DOSSEMAPHORES
+# include <os2.h>
+# include <uconv.h>
+#endif
+
 /*
 ** Determine if we are dealing with Windows NT.
 **