From: mistachkin <mistachkin@noemail.net>
Date: Sat, 9 Nov 2013 23:55:18 +0000 (+0000)
Subject: Fix compilation errors with some compilers that do not reference recent Windows SDK... 
X-Git-Tag: version-3.8.2~118
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9858bf2fb1c17107cc79772c9ad17d73e6841063;p=thirdparty%2Fsqlite.git

Fix compilation errors with some compilers that do not reference recent Windows SDK header files.

FossilOrigin-Name: a5805976f0e06ece2eeebd825f383a1ee88121fc
---

diff --git a/manifest b/manifest
index 542f046ce0..ff2faaf074 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\smemory\stype\smismatch\swhen\scompiled\swith\sMEMDEBUG.
-D 2013-11-09T23:44:02.375
+C Fix\scompilation\serrors\swith\ssome\scompilers\sthat\sdo\snot\sreference\srecent\sWindows\sSDK\sheader\sfiles.
+D 2013-11-09T23:55:18.487
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in d12e4455cf7a36e42d3949876c1c3b88ff70867a
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -205,7 +205,7 @@ F src/os.c b4ad71336fd96f97776f75587cd9e8218288f5be
 F src/os.h 4a46270a64e9193af4a0aaa3bc2c66dc07c29b3f
 F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
 F src/os_unix.c 143624d9eabb3b997c59cf594e0d06c56edd43e9
-F src/os_win.c 846def34c7ea070afbee1df011133b2d7729ba13
+F src/os_win.c 41bf0e5022ed35f1c29ff4d846b388b02260c5db
 F src/pager.c 2aa4444ffe86e9282d03bc349a4a5e49bd77c0e8
 F src/pager.h f094af9f6ececfaa8a1e93876905a4f34233fb0c
 F src/parse.y 073a8294e1826f1b1656e84806b77e4199f4bb57
@@ -1135,7 +1135,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
 F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
-P d06d9fdb6e6ac369035c825d9c30970115b3ba71
-R 81e3711b2ed15ff1b9a41f8d7b9097d4
+P 2c32bd6d4d5da2055633e8fb43ee184f729d8b91
+R 234ec895190027fdd0a5251f94783a38
 U mistachkin
-Z 3f2dd6d85d2c08d6bd7b3a7fc26349db
+Z 988cbc38d830179bd7e27cb1b774d3ee
diff --git a/manifest.uuid b/manifest.uuid
index c9304b72a5..c0f8ed19bd 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-2c32bd6d4d5da2055633e8fb43ee184f729d8b91
\ No newline at end of file
+a5805976f0e06ece2eeebd825f383a1ee88121fc
\ No newline at end of file
diff --git a/src/os_win.c b/src/os_win.c
index 4bbfd939b8..71999d2cdf 100644
--- a/src/os_win.c
+++ b/src/os_win.c
@@ -59,14 +59,29 @@
  must be defined."
 #endif
 
+/*
+** This constant should already be defined (in the "WinDef.h" SDK file).
+*/
+#ifndef MAX_PATH
+#  define MAX_PATH                      (260)
+#endif
+
 /*
 ** Maximum pathname length (in chars) for Win32.  This should normally be
 ** MAX_PATH.
 */
+
 #ifndef SQLITE_WIN32_MAX_PATH_CHARS
 #  define SQLITE_WIN32_MAX_PATH_CHARS   (MAX_PATH)
 #endif
 
+/*
+** This constant should already be defined (in the "WinNT.h" SDK file).
+*/
+#ifndef UNICODE_STRING_MAX_CHARS
+#  define UNICODE_STRING_MAX_CHARS      (32767)
+#endif
+
 /*
 ** Maximum pathname length (in chars) for WinNT.  This should normally be
 ** UNICODE_STRING_MAX_CHARS.