Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | patches to compile for WinNT (CVS 115) |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
47dfec3aaa896073ee0e26db428f0dc9 |
User & Date: | drh 2000-07-31 13:38:25.000 |
Context
2000-07-31
| ||
13:38 | patches to compile for WinNT (CVS 1701) (check-in: 52c2c50d09 user: drh tags: trunk) | |
13:38 | patches to compile for WinNT (CVS 115) (check-in: 47dfec3aaa user: drh tags: trunk) | |
11:59 | :-) (CVS 114) (check-in: dfbb8225c1 user: drh tags: trunk) | |
Changes
Changes to configure.
︙ | ︙ | |||
521 522 523 524 525 526 527 | else ac_n= ac_c='\c' ac_t= fi # The following RCS revision string applies to configure.in | | | 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 | else ac_n= ac_c='\c' ac_t= fi # The following RCS revision string applies to configure.in # $Revision: 1.5 $ ######### # Make sure we are not building in a subdirectory of the source tree. # temp=`echo $srcdir | grep '[^./]'` |
︙ | ︙ | |||
914 915 916 917 918 919 920 | else echo "$ac_t""no" 1>&6 fi TARGET_RANLIB=$RANLIB fi if test "$config_TARGET_AR" != ""; then | | | 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 | else echo "$ac_t""no" 1>&6 fi TARGET_RANLIB=$RANLIB fi if test "$config_TARGET_AR" != ""; then TARGET_AR=$config_TARGET_AR else TARGET_AR='ar cr' fi echo "$ac_t""$TARGET_TFLAGS" 1>&6 |
︙ | ︙ | |||
1716 1717 1718 1719 1720 1721 1722 | if test "$found" = "yes"; then TARGET_READLINE_INC="-I$dir/include/readline" break fi done fi if test "$found" = "yes"; then | > > > | > | | | 1716 1717 1718 1719 1720 1721 1722 1723 1724 1725 1726 1727 1728 1729 1730 1731 1732 1733 1734 1735 1736 1737 1738 1739 1740 1741 1742 1743 1744 1745 1746 1747 1748 1749 1750 | if test "$found" = "yes"; then TARGET_READLINE_INC="-I$dir/include/readline" break fi done fi if test "$found" = "yes"; then if test "$TARGET_READLINE_LIBS" = ""; then TARGET_HAVE_READLINE=0 else TARGET_HAVE_READLINE=1 fi else TARGET_HAVE_READLINE=0 fi ######### # Figure out whether or not we have a "usleep()" function. # echo $ac_n "checking for usleep""... $ac_c" 1>&6 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 1744 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char usleep(); below. */ #include <assert.h> /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ |
︙ | ︙ | |||
1755 1756 1757 1758 1759 1760 1761 | choke me #else usleep(); #endif ; return 0; } EOF | | | 1759 1760 1761 1762 1763 1764 1765 1766 1767 1768 1769 1770 1771 1772 1773 | choke me #else usleep(); #endif ; return 0; } EOF 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 echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* eval "ac_cv_func_usleep=no" |
︙ | ︙ |
Changes to configure.in.
︙ | ︙ | |||
147 148 149 150 151 152 153 | # the corresponding code. # 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 | | | 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 | # the corresponding code. # 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.5 $ ######### # Make sure we are not building in a subdirectory of the source tree. # changequote(<<<,>>>) temp=`echo $srcdir | grep '[^./]'` changequote([,]) |
︙ | ︙ | |||
281 282 283 284 285 286 287 | if test "$config_TARGET_RANLIB" != ""; then TARGET_RANLIB=$config_TARGET_RANLIB else AC_PROG_RANLIB TARGET_RANLIB=$RANLIB fi if test "$config_TARGET_AR" != ""; then | | | 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 | if test "$config_TARGET_RANLIB" != ""; then TARGET_RANLIB=$config_TARGET_RANLIB else AC_PROG_RANLIB TARGET_RANLIB=$RANLIB fi if test "$config_TARGET_AR" != ""; then TARGET_AR=$config_TARGET_AR else TARGET_AR='ar cr' fi AC_MSG_RESULT($TARGET_TFLAGS) AC_SUBST(TARGET_CC) AC_SUBST(TARGET_CFLAGS) AC_SUBST(TARGET_LINK) |
︙ | ︙ | |||
498 499 500 501 502 503 504 | if test "$found" = "yes"; then TARGET_READLINE_INC="-I$dir/include/readline" break fi done fi if test "$found" = "yes"; then | > > > | > | 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 | if test "$found" = "yes"; then TARGET_READLINE_INC="-I$dir/include/readline" break fi done fi if test "$found" = "yes"; then if test "$TARGET_READLINE_LIBS" = ""; then TARGET_HAVE_READLINE=0 else TARGET_HAVE_READLINE=1 fi else TARGET_HAVE_READLINE=0 fi AC_SUBST(TARGET_READLINE_INC) AC_SUBST(TARGET_HAVE_READLINE) ######### |
︙ | ︙ |
Changes to src/dbbe.c.
︙ | ︙ | |||
26 27 28 29 30 31 32 | ** sqlite and the code that does the actually reading and writing ** of information to the disk. ** ** This file uses GDBM as the database backend. It should be ** relatively simple to convert to a different database such ** as NDBM, SDBM, or BerkeleyDB. ** | | | 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 | ** sqlite and the code that does the actually reading and writing ** of information to the disk. ** ** This file uses GDBM as the database backend. It should be ** relatively simple to convert to a different database such ** as NDBM, SDBM, or BerkeleyDB. ** ** $Id: dbbe.c,v 1.17 2000/07/31 13:38:26 drh Exp $ */ #include "sqliteInt.h" #include <gdbm.h> #include <sys/stat.h> #include <unistd.h> #include <ctype.h> #include <time.h> |
︙ | ︙ | |||
133 134 135 136 137 138 139 140 141 142 143 144 145 146 | t = p->s[p->i]; p->s[p->i] = p->s[p->j]; p->s[p->j] = t; t = p->s[p->i] + p->s[p->j]; return t & 0xff; } /* ** This routine opens a new database. For the GDBM driver ** implemented here, the database name is the name of the directory ** containing all the files of the database. ** ** If successful, a pointer to the Dbbe structure is returned. ** If there are errors, an appropriate error message is left | > > > > > > > | 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 | t = p->s[p->i]; p->s[p->i] = p->s[p->j]; p->s[p->j] = t; t = p->s[p->i] + p->s[p->j]; 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 ** containing all the files of the database. ** ** If successful, a pointer to the Dbbe structure is returned. ** If there are errors, an appropriate error message is left |
︙ | ︙ |
Changes to src/main.c.
︙ | ︙ | |||
22 23 24 25 26 27 28 | ** ************************************************************************* ** Main file for the SQLite library. The routines in this file ** implement the programmer interface to the library. Routines in ** other files are for internal use by SQLite and should not be ** accessed by users of the library. ** | | | 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 | ** ************************************************************************* ** Main file for the SQLite library. The routines in this file ** implement the programmer interface to the library. Routines in ** other files are for internal use by SQLite and should not be ** accessed by users of the library. ** ** $Id: main.c,v 1.15 2000/07/31 13:38:26 drh Exp $ */ #include "sqliteInt.h" /* ** This is the callback routine for the code that initializes the ** database. Each callback contains text of a CREATE TABLE or ** CREATE INDEX statement that must be parsed to yield the internal |
︙ | ︙ | |||
286 287 288 289 290 291 292 | */ static int sqlite_default_busy_callback( void *Timeout, /* Maximum amount of time to wait */ const char *NotUsed, /* The name of the table that is busy */ int count /* Number of times table has been busy */ ){ int rc; | | | 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 | */ static int sqlite_default_busy_callback( void *Timeout, /* Maximum amount of time to wait */ const char *NotUsed, /* The name of the table that is busy */ int count /* Number of times table has been busy */ ){ int rc; #if defined(HAVE_USLEEP) && HAVE_USLEEP int delay = 10000; int prior_delay = 0; int timeout = (int)Timeout; int i; for(i=1; i<count; i++){ prior_delay += delay; |
︙ | ︙ |