The Windows OS flavor #ifdefs must be performed after the 'windows.h' file has been...

FossilOrigin-Name: 3702a31e56fe02d14ce246109b318a124cad9f1a

diff --git a/manifest b/manifest
index 49900ac0bee095354b35d6e125a0b081b30a38c8..9f0b01f8f2365ec386de52fc679117874af9491a 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Hand\smerge\sthe\szone\sallocator\sfor\sMacOS\sfrom\sthe\sapple-osx\sbranch.
-D 2011-12-08T20:41:33.299
+C The\sWindows\sOS\sflavor\s#ifdefs\smust\sbe\sperformed\safter\sthe\s'windows.h'\sfile\shas\sbeen\sincluded.
+D 2011-12-09T05:52:16.276
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5b4a3e12a850b021547e43daf886b25133b44c07
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -163,7 +163,7 @@ F src/mutex_unix.c b4f4e923bb8de93ec3f251fadb50855f23df9579
 F src/mutex_w32.c 5e54f3ba275bcb5d00248b8c23107df2e2f73e33
 F src/notify.c 976dd0f6171d4588e89e874fcc765e92914b6d30
 F src/os.c 28bbdab2170dfce84d86c45456a18eab1d0f99a9
-F src/os.h 5830d32c4dab94fa0373404a139ada670e800731
+F src/os.h 549b1a2e5e0ed1e1499f252dac126c4973e7379c
 F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
 F src/os_os2.c 4a75888ba3dfc820ad5e8177025972d74d7f2440
 F src/os_unix.c 4fbb91726165e105c1679a2660f49a3f4c376e4f
@@ -977,7 +977,7 @@ F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings-clang.sh 9f406d66e750e8ac031c63a9ef3248aaa347ef2a
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
-P 9687b305c2320109a8649612181eecd2e0da7c7b
-R 83ba2438b14dfac192d8fdfea2ba6d38
-U drh
-Z a86d3022d423432c98b77483099e12da
+P 0d955c20c02da29582b5cd8df2b7124fb9d12ebb
+R cba6a22ba8dad5c2320a7a8f8ac118be
+U mistachkin
+Z 5127f14a32c508056103def7f6cd4a97

diff --git a/manifest.uuid b/manifest.uuid
index 199e8418f594ba659fe3c736094925d3976e17b8..65b2a7467dc93c9567bb7789a77f6c584070d15c 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-0d955c20c02da29582b5cd8df2b7124fb9d12ebb
\ No newline at end of file
+3702a31e56fe02d14ce246109b318a124cad9f1a
\ No newline at end of file

diff --git a/src/os.h b/src/os.h
index aa544697e13f305aa779650aa7eaeb6c443bb2d6..80afc516ff460e010e1ca4b0f90198e43a45539a 100644 (file)
--- a/src/os.h
+++ b/src/os.h
@@ -65,26 +65,6 @@
 # endif
 #endif
 
-/*
-** Determine if we are dealing with Windows NT.
-*/
-#if defined(_WIN32_WINNT)
-# define SQLITE_OS_WINNT 1
-#else
-# define SQLITE_OS_WINNT 0
-#endif
-
-/*
-** Determine if we are dealing with WindowsCE - which has a much
-** reduced API.
-*/
-#if defined(_WIN32_WCE)
-# define SQLITE_OS_WINCE 1
-#else
-# define SQLITE_OS_WINCE 0
-#endif
-
-
 /*
 ** Define the maximum size of a temporary filename
 */
@@ -109,6 +89,25 @@
 # define SQLITE_TEMPNAME_SIZE 200
 #endif
 
+/*
+** Determine if we are dealing with Windows NT.
+*/
+#if defined(_WIN32_WINNT)
+# define SQLITE_OS_WINNT 1
+#else
+# define SQLITE_OS_WINNT 0
+#endif
+
+/*
+** Determine if we are dealing with WindowsCE - which has a much
+** reduced API.
+*/
+#if defined(_WIN32_WCE)
+# define SQLITE_OS_WINCE 1
+#else
+# define SQLITE_OS_WINCE 0
+#endif
+
 /* If the SET_FULLSYNC macro is not defined above, then make it
 ** a no-op
 */