Remove (newly) incorrect preprocessor check to fix build on WinRT.

mistachkin · mistachkin · commit 16d511a664c5 · 2014-08-02T20:44:13.000Z
FossilOrigin-Name: ba7826542908eac2e14789d183d0b3e35b143fed
diff --git a/manifest b/manifest
@@ -1,5 +1,5 @@
-C A\sbetter\scomment\son\sthe\sgenerated\scode\sfor\sthe\sNULL-in-RHS-of-IN\sdetection\nlogic.
-D 2014-08-01T21:12:35.509
+C Remove\s(newly)\sincorrect\spreprocessor\scheck\sto\sfix\sbuild\son\sWinRT.
+D 2014-08-02T20:44:13.563
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5eb79e334a5de69c87740edd56af6527dd219308
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -208,7 +208,7 @@ F src/os.h 60d419395e32a8029fa380a80a3da2e9030f635e
 F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
 F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa
 F src/os_unix.c a7baf1b30f3c58ba20b813e01aab23b18ae44f85
-F src/os_win.c c67bec43e5dadde8029470ab7b7825ccc9abe578
+F src/os_win.c e5f0fc446a682b70db3397d14cca9806d9a15d12
 F src/os_win.h 057344a6720b4c8405d9bd98f58cb37a6ee46c25
 F src/pager.c f6bb1fa6cdf2062f2d8aec3e64db302bca519ab8
 F src/pager.h ffd5607f7b3e4590b415b007a4382f693334d428
@@ -1185,7 +1185,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 468e730036edac22cfeb9ea3515aa16e6bcd6650
-R 894229228ea8340c8d39c1accaa43c91
-U drh
-Z 2180e0f63fb08551c10fb11eafeeb559
+P 9bc1c730a366e75b760b58e7a343d39165b2a469
+R 8c9bd54f21254a5c39cdbf67a68f6f01
+U mistachkin
+Z a3832f522ef0a90c3ccd915e060c6930
diff --git a/manifest.uuid b/manifest.uuid
@@ -1 +1 @@
-9bc1c730a366e75b760b58e7a343d39165b2a469
+ba7826542908eac2e14789d183d0b3e35b143fed
diff --git a/src/os_win.c b/src/os_win.c
@@ -415,8 +415,7 @@ const sqlite3_mem_methods *sqlite3MemGetWin32(void);
 */
 #ifdef SQLITE_TEST
 LONG volatile sqlite3_os_type = 0;
-#elif !SQLITE_OS_WINCE && !SQLITE_OS_WINRT && \
-      defined(SQLITE_WIN32_HAS_ANSI) && defined(SQLITE_WIN32_HAS_WIDE)
+#else
 static LONG volatile sqlite3_os_type = 0;
 #endif
 

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-9bc1c730a366e75b760b58e7a343d39165b2a469`
	`1`	`+ba7826542908eac2e14789d183d0b3e35b143fed`