patches to compile for WinNT (CVS 115)

FossilOrigin-Name: 47dfec3aaa896073ee0e26db428f0dc9b27f94f3

diff --git a/configure b/configure
index 42a2bc152d350201f82f3a5424e2083a6d5baffa..88f15ecde04e8964989614c453409ce613bd8c8e 100755 (executable)
--- a/configure
+++ b/configure
@@ -525,7 +525,7 @@ fi
 
 
 # The following RCS revision string applies to configure.in
-# $Revision: 1.4 $
+# $Revision: 1.5 $
 
 #########
 # Make sure we are not building in a subdirectory of the source tree.
@@ -918,7 +918,7 @@ fi
   TARGET_RANLIB=$RANLIB
 fi
 if test "$config_TARGET_AR" != ""; then
-  TARGET_RANLIB=$config_TARGET_AR
+  TARGET_AR=$config_TARGET_AR
 else
   TARGET_AR='ar cr'
 fi
@@ -1720,7 +1720,11 @@ fi
   done
 fi
 if test "$found" = "yes"; then
-  TARGET_HAVE_READLINE=1
+  if test "$TARGET_READLINE_LIBS" = ""; then
+    TARGET_HAVE_READLINE=0
+  else
+    TARGET_HAVE_READLINE=1
+  fi
 else
   TARGET_HAVE_READLINE=0
 fi
@@ -1731,12 +1735,12 @@ fi
 # Figure out whether or not we have a "usleep()" function.
 #
 echo $ac_n "checking for usleep""... $ac_c" 1>&6
-echo "configure:1735: checking for usleep" >&5
+echo "configure:1739: checking for usleep" >&5
 if eval "test \"`echo '$''{'ac_cv_func_usleep'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1740 "configure"
+#line 1744 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char usleep(); below.  */
@@ -1759,7 +1763,7 @@ usleep();
 
 ; return 0; }
 EOF
-if { (eval echo configure:1763: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1767: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_usleep=yes"
 else

diff --git a/configure.in b/configure.in
index 7b93db503519a044de608d6075ab9b596a784a20..8b6e17d9f258e2d05959dfc7627ca77e4a051977 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -151,7 +151,7 @@ AC_INIT(src/sqlite.h)
 dnl Put the RCS revision string after AC_INIT so that it will also
 dnl show in in configure.
 # The following RCS revision string applies to configure.in
-# $Revision: 1.4 $
+# $Revision: 1.5 $
 
 #########
 # Make sure we are not building in a subdirectory of the source tree.
@@ -285,7 +285,7 @@ else
   TARGET_RANLIB=$RANLIB
 fi
 if test "$config_TARGET_AR" != ""; then
-  TARGET_RANLIB=$config_TARGET_AR
+  TARGET_AR=$config_TARGET_AR
 else
   TARGET_AR='ar cr'
 fi
@@ -502,7 +502,11 @@ if test "$found" = "no"; then
   done
 fi
 if test "$found" = "yes"; then
-  TARGET_HAVE_READLINE=1
+  if test "$TARGET_READLINE_LIBS" = ""; then
+    TARGET_HAVE_READLINE=0
+  else
+    TARGET_HAVE_READLINE=1
+  fi
 else
   TARGET_HAVE_READLINE=0
 fi

diff --git a/manifest b/manifest
index 62f33402750caadb90ad7439429696d9a30f11e1..61ecac05faa51dc635f215e7cdd44d2085744652 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,18 +1,18 @@
-C :-)\s(CVS\s114)
-D 2000-07-31T11:59:03
+C patches\sto\scompile\sfor\sWinNT\s(CVS\s115)
+D 2000-07-31T13:38:25
 F COPYRIGHT 74a8a6531a42e124df07ab5599aad63870fa0bd4
 F Makefile.in 9e6dcd232e594fb599a5e9ba8bcf45e6c6e2fe72
 F README 51f6a4e7408b34afa5bc1c0485f61b6a4efb6958
-F configure 1354f60305c781609c94cd4b677ab4ff4d830b85 x
-F configure.in 77732d0a7d3ec66b7fc2303ae823fa5419ca7e6c
+F configure 51063d594190fa085f909cefc9427241088bec4f x
+F configure.in a04f02ba61ed09a00e862b4f78b91b06a559e0b5
 F doc/lemon.html e233a3e97a779c7a87e1bc4528c664a58e49dd47
 F src/build.c ecb8ec724914780efed01d1739e6dd398d75af46
-F src/dbbe.c 3604cf7dec6856a4963ab8f2220449f3d02e759a
+F src/dbbe.c 1bc12590063a21e6098503b5821df87da20c1d8f
 F src/dbbe.h 8718b718b36d37584e9bbdfccec10588fa91271f
 F src/delete.c 4d491eaf61b515516749c7ed68fa3b2ee8a09065
 F src/expr.c 2fa63f086707176d09092e71832f9bbdc6a8ac85
 F src/insert.c f146f149ad2422a1dc3bfa7a1651a25940f98958
-F src/main.c 82dba47063cb9837910c3bcefacb47de7486fb47
+F src/main.c c4b6678af8326cc602f61de51d451697451fd177
 F src/parse.y 754653f073ee03749471f86ef1bca641b35887c7
 F src/select.c d382e96c2221d08367cc87976f2b574537c9de97
 F src/shell.c a5eb8ee9d5f90e735900a92e7fc364a54deb2cfb
@@ -66,7 +66,7 @@ F www/lang.tcl 1645e9107d75709be4c6099b643db235bbe0a151
 F www/opcode.tcl cb3a1abf8b7b9be9f3a228d097d6bf8b742c2b6f
 F www/sqlite.tcl 69781eaffb02e17aa4af28b76a2bedb19baa8e9f
 F www/vdbe.tcl bcbfc33bcdd0ebad95eab31286adb9e1bc289520
-P 69b73ea3a0822ce16e69813b387d596b183e7892
-R e0705b1f01b2d7253415a535e7c1cb4b
+P dfbb8225c1da34673a37f571f1ca1e12928728fe
+R 0d93c426d053c3c080390a9a083935d2
 U drh
-Z 700ce941c2a311b4c72c1e08338a3383
+Z 023b49ade9ed0d90761954af7550abea

diff --git a/manifest.uuid b/manifest.uuid
index 718ab3ef5dcd6b00350b7cde3527399887092157..19cca0eb3c780c8651b9e7e76cb5c6e8c2ff5ebe 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-dfbb8225c1da34673a37f571f1ca1e12928728fe
\ No newline at end of file
+47dfec3aaa896073ee0e26db428f0dc9b27f94f3
\ No newline at end of file

diff --git a/src/dbbe.c b/src/dbbe.c
index a3baff975ba19eb50224b3e22d9f48fd704dd4b3..48c37ba38863be5c9c5c5d6da9a80838145b13a5 100644 (file)
--- a/src/dbbe.c
+++ b/src/dbbe.c
@@ -30,7 +30,7 @@
 ** relatively simple to convert to a different database such
 ** as NDBM, SDBM, or BerkeleyDB.
 **
-** $Id: dbbe.c,v 1.16 2000/07/28 14:32:49 drh Exp $
+** $Id: dbbe.c,v 1.17 2000/07/31 13:38:26 drh Exp $
 */
 #include "sqliteInt.h"
 #include <gdbm.h>
@@ -137,6 +137,13 @@ static int rc4byte(struct rc4 *p){
   return t & 0xff;
 }
 
+/*
+** The "mkdir()" function only takes one argument under Windows.
+*/
+#if OS_WIN
+# define mkdir(A,B) mkdir(A)
+#endif
+
 /*
 ** This routine opens a new database.  For the GDBM driver
 ** implemented here, the database name is the name of the directory

diff --git a/src/main.c b/src/main.c
index b1233a98f8083452c1c7b986c8b055b047454866..7aea930a816ed23aa3f881cef19b6660a95e572a 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -26,7 +26,7 @@
 ** other files are for internal use by SQLite and should not be
 ** accessed by users of the library.
 **
-** $Id: main.c,v 1.14 2000/07/28 14:32:49 drh Exp $
+** $Id: main.c,v 1.15 2000/07/31 13:38:26 drh Exp $
 */
 #include "sqliteInt.h"
 
@@ -290,7 +290,7 @@ static int sqlite_default_busy_callback(
  int count                /* Number of times table has been busy */
 ){
   int rc;
-#ifdef HAVE_USLEEP
+#if defined(HAVE_USLEEP) && HAVE_USLEEP
   int delay = 10000;
   int prior_delay = 0;
   int timeout = (int)Timeout;