Fix several header file comments. No changes to code.

FossilOrigin-Name: dd6eb5d1eb4d50023a008fac116497ede29600c1

diff --git a/manifest b/manifest
index 0a0e83ebbd9d58b7727562f867ef8577283a218f..bbea0afd3ad4e064e5179b88c3ede0b2b1faade4 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Merge\supdates\sfrom\strunk.
-D 2014-05-02T21:38:02.443
+C Fix\sseveral\sheader\sfile\scomments.\s\sNo\schanges\sto\scode.
+D 2014-05-05T17:43:28.823
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in dd2b1aba364ff9b05de41086f74407f285c57670
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -204,10 +204,10 @@ F src/notify.c 976dd0f6171d4588e89e874fcc765e92914b6d30
 F src/os.c 1b147e4cf7cc39e618115c14a086aed44bc91ace
 F src/os.h 60d419395e32a8029fa380a80a3da2e9030f635e
 F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
-F src/os_setup.h 3f9e87d981eef070c8a11e76b4704842a0e5870f
+F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa
 F src/os_unix.c ae4b5240af4619d711301d7992396e182585269f
 F src/os_win.c 089fcb45dabe90a4c87369cc69846838198dd221
-F src/os_win.h ac253253d080dc3dd261efe5e98626c4b95e5a26
+F src/os_win.h ca9c83efaf41298691553e1d0f7e11328168d8b8
 F src/pager.c ab62a24218d87dda1be641f6c5ad291bff78fd94
 F src/pager.h ffd5607f7b3e4590b415b007a4382f693334d428
 F src/parse.y 22d6a074e5f5a7258947a1dc55a9bf946b765dd0
@@ -1168,7 +1168,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
 F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
-P 09cf240a7fb4022aeb1d7ae2a2455b5f97b53d68 faa469355eabb2c407f24638b090725448aac37f
-R 332509ae33dff41f389350276535e395
+P c4d1d8a0db48f523d1624f2468261c171152c0f7
+R e81e8bbcb0f41d36dce23eda3c309a85
 U mistachkin
-Z 6c2182b94bf292df6ecab4543f02e83a
+Z 2824130e829ad3dc4daa36d25ec17b58

diff --git a/manifest.uuid b/manifest.uuid
index b20cd682c514accb5230116309941c3e9a9b3566..fd4cdfc69fd244e7d1f52a6a9a7f66c42196d483 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c4d1d8a0db48f523d1624f2468261c171152c0f7
\ No newline at end of file
+dd6eb5d1eb4d50023a008fac116497ede29600c1
\ No newline at end of file

diff --git a/src/os_setup.h b/src/os_setup.h
index 5b010b894e357e4d4f54f30987ff85df45d25581..68de1446ed732744bd359c4504673dd8dc138dc3 100644 (file)
--- a/src/os_setup.h
+++ b/src/os_setup.h
@@ -22,7 +22,7 @@
 **
 ** After the following block of preprocess macros, all of SQLITE_OS_UNIX,
 ** SQLITE_OS_WIN, and SQLITE_OS_OTHER will defined to either 1 or 0.  One of
-** the four will be 1.  The other three will be 0.
+** the three will be 1.  The other two will be 0.
 */
 #if defined(SQLITE_OS_OTHER)
 #  if SQLITE_OS_OTHER==1

diff --git a/src/os_win.h b/src/os_win.h
index 6ccd9f48282611bac358ab1556da3a75a7d24e44..cb1ff80bd99aa8da5b60a72ee1b2b24b6f9dbbfa 100644 (file)
--- a/src/os_win.h
+++ b/src/os_win.h
@@ -16,7 +16,7 @@
 #define _OS_WIN_H_
 
 /*
-** Include the Windows SDK header file.
+** Include the primary Windows SDK header file.
 */
 #include "windows.h"
 
@@ -28,8 +28,8 @@
 /*
 ** 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:
+** We ought to be able to determine if we are compiling for Windows 9x or
+** Windows NT using the _WIN32_WINNT macro as follows:
 **
 ** #if defined(_WIN32_WINNT)
 ** # define SQLITE_OS_WINNT 1
@@ -37,18 +37,18 @@
 ** # 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.
+** However, Visual Studio 2005 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 Windows NT unless the programmer explicitly says otherwise
+** by setting SQLITE_OS_WINNT to 0.
 */
 #if SQLITE_OS_WIN && !defined(SQLITE_OS_WINNT)
 # define SQLITE_OS_WINNT 1
 #endif
 
 /*
-** Determine if we are dealing with WindowsCE - which has a much
-** reduced API.
+** Determine if we are dealing with Windows CE - which has a much reduced
+** API.
 */
 #if defined(_WIN32_WCE)
 # define SQLITE_OS_WINCE 1