From a2eebaa43b3e7f555f5fb84490814e591b81a001 Mon Sep 17 00:00:00 2001 From: drh Date: Tue, 29 Nov 2005 19:50:24 +0000 Subject: [PATCH] Make the build work on windows again. Ticket #1544. (CVS 2793) FossilOrigin-Name: 59bdca2552b2e5c09d5ca2b7a02ee34460139d7b --- manifest | 14 +++++++------- manifest.uuid | 2 +- src/os.h | 1 + src/os_win.c | 1 - 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/manifest b/manifest index 319f47e197..9d9e6352e4 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C The\scrash\stests\snow\scompile,\sat\sleast.\s\sBut\sthey\sget\swrong\sresults.\s\sThe\nproblem\sis\sfundamental\sand\ssuggests\sI\sneed\sto\scompletely\srethink\show\sthe\nnew\sOS\sbackend\sshould\swork.\s(CVS\s2792) -D 2005-11-29T18:37:16 +C Make\sthe\sbuild\swork\son\swindows\sagain.\s\sTicket\s#1544.\s(CVS\s2793) +D 2005-11-29T19:50:25 F Makefile.in eac4c98a32a0eae9d6bb2779ac74bbb5441758d3 F Makefile.linux-gcc aee18d8a05546dcf1888bd4547e442008a49a092 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028 @@ -50,13 +50,13 @@ F src/insert.c da031c3ed8e1675fac891990095d277c2ba6e205 F src/legacy.c d58ea507bce885298a2c8c3cbb0f4bff5d47830b F src/main.c 97bb830cdbd378d1f87469618471f52d9d263d09 F src/md5.c 7ae1c39044b95de2f62e066f47bb1deb880a1070 -F src/os.h a429c3534c1179ce925c120b3ce9b82543a9873a +F src/os.h 4172cf1dfb84ce13fe5f1073accbc320b4b25ad2 F src/os_common.h d74a11728ad2444b6b695b94c28c06881f049e49 F src/os_test.c 49833426101f99aee4bb5f6a44b7c4b2029fda1c F src/os_test.h 903c93554c23d88f34f667f1979e4a1cee792af3 F src/os_unix.c 02b6a1c7e7a646da10f41f8ed3364a2a1c33c135 F src/os_unix.h 5768d56d28240d3fe4537fac08cc85e4fb52279e -F src/os_win.c f18626e44669e12fba9948dd98934ab4b46c343c +F src/os_win.c 2095cae6b283edc4e6b9d9d6a8a509210ea51eac F src/os_win.h 41a946bea10f61c158ce8645e7646b29d44f122b F src/pager.c 18cc5b274a0df28dc9145da522a6e281f80b925f F src/pager.h e7b41ce8e7b5f629d456708b7ad9a8c8ede37140 @@ -323,7 +323,7 @@ F www/tclsqlite.tcl ddcf912ea48695603c8ed7efb29f0812ef8d1b49 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0 F www/version3.tcl a99cf5f6d8bd4d5537584a2b342f0fb9fa601d8b F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513 -P 058f31753871b16b40fe4048e3adcee411e0f87d -R f03dc6c82442298d495305724980efdb +P 966bc68e1bf4e0cc88407871c162ee3014160415 +R fff5192ec05195c47f01284580b629fa U drh -Z cd7ffca575734c25d3ac042458e8a016 +Z 9e4962749cc7ab5edc65f043e5a44501 diff --git a/manifest.uuid b/manifest.uuid index 8d82992eb3..c275ff2ea7 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -966bc68e1bf4e0cc88407871c162ee3014160415 \ No newline at end of file +59bdca2552b2e5c09d5ca2b7a02ee34460139d7b \ No newline at end of file diff --git a/src/os.h b/src/os.h index 412273b5f4..5996cecc2a 100644 --- a/src/os.h +++ b/src/os.h @@ -51,6 +51,7 @@ typedef struct OsFile OsFile; ** Define the maximum size of a temporary filename */ #if OS_WIN +# include # define SQLITE_TEMPNAME_SIZE (MAX_PATH+50) #else # define SQLITE_TEMPNAME_SIZE 200 diff --git a/src/os_win.c b/src/os_win.c index e1833b766a..b07115ff19 100644 --- a/src/os_win.c +++ b/src/os_win.c @@ -16,7 +16,6 @@ #include "os.h" #if OS_WIN /* This file is used for windows only */ -#include #include #ifdef __CYGWIN__