/ Check-in [1ce4d21d]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Do not rely on the _WIN32_WINNT macro as vs2005 does not define it by default. Instead, always assume winNT unless the makefile explicitly sets SQLITE_OS_WINNT=0.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 1ce4d21d521c383f2607222006023b6812f147bc
User & Date: drh 2012-01-30 16:02:43
Context
2012-01-30
18:00
Fix compiler warnings in the TCL test harness. check-in: c4cd38a0 user: drh tags: trunk
16:02
Do not rely on the _WIN32_WINNT macro as vs2005 does not define it by default. Instead, always assume winNT unless the makefile explicitly sets SQLITE_OS_WINNT=0. check-in: 1ce4d21d user: drh tags: trunk
2012-01-28
21:08
Update the .dump command of the command-line shell so that it (1) avoids putting the semicolon of a DDL statement on the same line as a comment, (2) avoids long expression, even when dumping a table with many columns, and (3) avoids unnecessary quoting of the table name. This fixes tickets [c04a8b8a4f] and [232637c465]. Shell change only; no changes to the SQLite core. check-in: e6eea8d5 user: drh tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/os.h.

    87     87   # define SQLITE_TEMPNAME_SIZE (CCHMAXPATHCOMP)
    88     88   #else
    89     89   # define SQLITE_TEMPNAME_SIZE 200
    90     90   #endif
    91     91   
    92     92   /*
    93     93   ** Determine if we are dealing with Windows NT.
           94  +**
           95  +** We ought to be able to determine if we are compiling for win98 or winNT
           96  +** using the _WIN32_WINNT macro as follows:
           97  +**
           98  +** #if defined(_WIN32_WINNT)
           99  +** # define SQLITE_OS_WINNT 1
          100  +** #else
          101  +** # define SQLITE_OS_WINNT 0
          102  +** #endif
          103  +**
          104  +** However, vs2005 does not set _WIN32_WINNT by default, as it ought to,
          105  +** so the above test does not work.  We'll just assume that everything is
          106  +** winNT unless the programmer explicitly says otherwise by setting
          107  +** SQLITE_OS_WINNT to 0.
    94    108   */
    95         -#if defined(_WIN32_WINNT)
          109  +#if SQLITE_OS_WIN && !defined(SQLITE_OS_WINNT)
    96    110   # define SQLITE_OS_WINNT 1
    97         -#else
    98         -# define SQLITE_OS_WINNT 0
    99    111   #endif
   100    112   
   101    113   /*
   102    114   ** Determine if we are dealing with WindowsCE - which has a much
   103    115   ** reduced API.
   104    116   */
   105    117   #if defined(_WIN32_WCE)