Including os2safe.h from os_os2.c is no longer necessary (now that it's including...

FossilOrigin-Name: 6432bbe1c1db1d31bd0057d99a9d6b6a428d8ffc

diff --git a/manifest b/manifest
index ed62efeaa9d731ba5aece0b520b5074c7e1dbc24..c8cc1af4c9d4e27dd57907e7421e687a0ccd6e9b 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C old\semx/gcc\ssets\s__EMX__\s(with\sdouble\sunderscores)\sas\sbuiltin\s#define\s(CVS\s4147)
-D 2007-06-30T15:24:38
+C Including\sos2safe.h\sfrom\sos_os2.c\sis\sno\slonger\snecessary\s(now\sthat\sit's\sincluding\sfrom\sos.h)\s(CVS\s4148)
+D 2007-06-30T16:30:40
 F Makefile.in 0c0e53720f658c7a551046442dd7afba0b72bfbe
 F Makefile.linux-gcc 65241babba6faf1152bf86574477baab19190499
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -89,7 +89,7 @@ F src/md5.c c5fdfa5c2593eaee2e32a5ce6c6927c986eaf217
 F src/os.c 1f10b47acc1177fb9225edb4f5f0d25ed716f9cb
 F src/os.h cea2e179bb33f4fc09dbb9fcd51b2246544bd2db
 F src/os_common.h a38233cd3b1f260db6f01f1093295d5708130065
-F src/os_os2.c 2ce97909b926a598823f97338027dbec1dcf4165
+F src/os_os2.c ca47aa5fd9c7d501f7d15aedb912146e9826c1c3
 F src/os_os2.h e5f17dd69333632bbc3112881ea407c37d245eb3
 F src/os_test.c 49833426101f99aee4bb5f6a44b7c4b2029fda1c
 F src/os_test.h 903c93554c23d88f34f667f1979e4a1cee792af3
@@ -517,7 +517,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P f1e5fed8eb0fb92bd0f040666c017850afe3cf9f
-R 32cb13f3fe445bd75e8118b293d404dc
+P d69204fec718a5d6d95351ee7a0c068a1c59222d
+R be39a5ac8d7d6d1748b4e11d52e672fa
 U pweilbacher
-Z bf2b5da3f5ed4235b2c504185b71aebe
+Z 71fb05fb67c7461fdb4943b9d9652f2f

diff --git a/manifest.uuid b/manifest.uuid
index c56373936e638471b92429ebe41a61cb02b44e86..27e85bf1e336ecba35e8a56ea79b50e93523923f 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d69204fec718a5d6d95351ee7a0c068a1c59222d
\ No newline at end of file
+6432bbe1c1db1d31bd0057d99a9d6b6a428d8ffc
\ No newline at end of file

diff --git a/src/os_os2.c b/src/os_os2.c
index 740ba359fba321e76934fd77ca81e04b305b81e5..7b89bc049acdbd2b31d683d97aaac9f335439b83 100644 (file)
--- a/src/os_os2.c
+++ b/src/os_os2.c
@@ -13,11 +13,6 @@
 ** This file contains code that is specific to OS/2.
 */
 
-#if (__GNUC__ > 3 || __GNUC__ == 3 && __GNUC_MINOR__ >= 3) && defined(OS2_HIGH_MEMORY)
-/* os2safe.h has to be included before os2.h, needed for high mem */
-#include <os2safe.h>
-#endif
-
 #include "sqliteInt.h"
 #include "os.h"