Do not rely on the _WIN32_WINNT macro as vs2005 does not define it by default.

Instead, always assume winNT unless the makefile explicitly sets
SQLITE_OS_WINNT=0.

FossilOrigin-Name: 1ce4d21d521c383f2607222006023b6812f147bc

diff --git a/manifest b/manifest
index 65dacefaf9480085fbcc16b5e066bba83a0d69fe..70f2c518095253b16ff1899f7ab8a326ac0ebc7a 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Update\sthe\s.dump\scommand\sof\sthe\scommand-line\sshell\sso\sthat\sit\s(1)\savoids\nputting\sthe\ssemicolon\sof\sa\sDDL\sstatement\son\sthe\ssame\sline\sas\sa\scomment,\n(2)\savoids\slong\sexpression,\seven\swhen\sdumping\sa\stable\swith\smany\scolumns,\sand\n(3)\savoids\sunnecessary\squoting\sof\sthe\stable\sname.\s\sThis\sfixes\stickets\n[c04a8b8a4f]\sand\s[232637c465].\s\s\nShell\schange\sonly;\sno\schanges\sto\sthe\sSQLite\score.
-D 2012-01-28T21:08:51.203
+C Do\snot\srely\son\sthe\s_WIN32_WINNT\smacro\sas\svs2005\sdoes\snot\sdefine\sit\sby\sdefault.\nInstead,\salways\sassume\swinNT\sunless\sthe\smakefile\sexplicitly\ssets\nSQLITE_OS_WINNT=0.
+D 2012-01-30T16:02:43.227
 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 a2219c3b05ce31230bb000fdc4f1a542b33ee649
+F src/os.h 59beba555b65a450bd1d804220532971d4299f60
 F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
 F src/os_os2.c 4a75888ba3dfc820ad5e8177025972d74d7f2440
 F src/os_unix.c 657672fab2580a84116c140b36ee3d6b6fc75b4e
@@ -988,7 +988,7 @@ F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings-clang.sh 9f406d66e750e8ac031c63a9ef3248aaa347ef2a
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
-P 2b2a7d8d736d1e72f847f443b9957e41da6149c9
-R 5a7483ac490fc4e2695fc3318a7874ef
+P e6eea8d50d6c307e3e34891758ed4912d368580b
+R d41d0e596905eec4813377a891733df0
 U drh
-Z e85ab90d7cc64a88d5a03e912d2818dd
+Z b751da7b0de6a1a7fd7886b082350257

diff --git a/manifest.uuid b/manifest.uuid
index 348e1738541576226e022f91dc6a3ee885a7f63c..d3c0d0a22e7287910d563584602854234c2b33a2 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e6eea8d50d6c307e3e34891758ed4912d368580b
\ No newline at end of file
+1ce4d21d521c383f2607222006023b6812f147bc
\ No newline at end of file

diff --git a/src/os.h b/src/os.h
index 08cd178e7206007f8a8d7a4c968e2528f52593ac..7dc0c8c2fbd52122031af43ced9d775c79503409 100644 (file)
--- a/src/os.h
+++ b/src/os.h
@@ -91,11 +91,23 @@
 
 /*
 ** Determine if we are dealing with Windows NT.
+**
+** We ought to be able to determine if we are compiling for win98 or winNT
+** using the _WIN32_WINNT macro as follows:
+**
+** #if defined(_WIN32_WINNT)
+** # define SQLITE_OS_WINNT 1
+** #else
+** # define SQLITE_OS_WINNT 0
+** #endif
+**
+** However, vs2005 does not set _WIN32_WINNT by default, as it ought to,
+** so the above test does not work.  We'll just assume that everything is
+** winNT unless the programmer explicitly says otherwise by setting
+** SQLITE_OS_WINNT to 0.
 */
-#if defined(_WIN32_WINNT)
+#if SQLITE_OS_WIN && !defined(SQLITE_OS_WINNT)
 # define SQLITE_OS_WINNT 1
-#else
-# define SQLITE_OS_WINNT 0
 #endif
 
 /*