Fossil SCM

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

jan.nijtmans 2014-08-05 07:06 trunk
Commit 855b1a5037a7125ca544b4ddad1552fcfb398b87
Parent cd029906920e76d…
1 file changed +1 -2
~ src/sqlite3.c
M src/sqlite3.c
+1 -2
--- src/sqlite3.c
+++ src/sqlite3.c
@@ -32406,12 +32406,11 @@
3240632406
 ** In order to facilitate testing on a WinNT system, the test fixture
3240732407
 ** can manually set this value to 1 to emulate Win98 behavior.
3240832408
 */
3240932409
 #ifdef SQLITE_TEST
3241032410
 SQLITE_API LONG volatile sqlite3_os_type = 0;
32411
-#elif !SQLITE_OS_WINCE && !SQLITE_OS_WINRT && \
32412
- defined(SQLITE_WIN32_HAS_ANSI) && defined(SQLITE_WIN32_HAS_WIDE)
32411
+#else
3241332412
 static LONG volatile sqlite3_os_type = 0;
3241432413
 #endif
3241532414
3241632415
 #ifndef SYSCALL
3241732416
 # define SYSCALL sqlite3_syscall_ptr
3241832417
--- src/sqlite3.c
+++ src/sqlite3.c
@@ -32406,12 +32406,11 @@
32406 ** In order to facilitate testing on a WinNT system, the test fixture
32407 ** can manually set this value to 1 to emulate Win98 behavior.
32408 */
32409 #ifdef SQLITE_TEST
32410 SQLITE_API LONG volatile sqlite3_os_type = 0;
32411 #elif !SQLITE_OS_WINCE && !SQLITE_OS_WINRT && \
32412 defined(SQLITE_WIN32_HAS_ANSI) && defined(SQLITE_WIN32_HAS_WIDE)
32413 static LONG volatile sqlite3_os_type = 0;
32414 #endif
32415
32416 #ifndef SYSCALL
32417 # define SYSCALL sqlite3_syscall_ptr
32418
--- src/sqlite3.c
+++ src/sqlite3.c
@@ -32406,12 +32406,11 @@
32406 ** In order to facilitate testing on a WinNT system, the test fixture
32407 ** can manually set this value to 1 to emulate Win98 behavior.
32408 */
32409 #ifdef SQLITE_TEST
32410 SQLITE_API LONG volatile sqlite3_os_type = 0;
32411 #else
 
32412 static LONG volatile sqlite3_os_type = 0;
32413 #endif
32414
32415 #ifndef SYSCALL
32416 # define SYSCALL sqlite3_syscall_ptr
32417

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button