/ Check-in [857f2baf]
Login
SQLite training in Houston TX on 2019-11-05 (details)
Part of the 2019 Tcl Conference

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

Overview
Comment:Centralize and reform use of the Win32 related include files.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | winHdr
Files: files | file ages | folders
SHA1: 857f2baf9b722e4eb1ac0d50fe03e32d5176185b
User & Date: mistachkin 2014-05-05 18:24:47
Context
2014-05-05
20:21
Attempt to fix the build on beagleboard. Closed-Leaf check-in: 3ac75725 user: drh tags: winHdr
19:57
Try to reduce the amount of memory used to hold the schema when PRAGMA ignore_check_constraints is active. check-in: 35a9f3f1 user: drh tags: reduce-schema-size
18:24
Centralize and reform use of the Win32 related include files. check-in: 857f2baf user: mistachkin tags: winHdr
17:45
Merge updates from trunk. check-in: a3cfd813 user: mistachkin tags: winHdr
2014-05-02
22:39
Enhance the Win32 VFS I/O retry logic. check-in: 47605043 user: mistachkin tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to Makefile.in.

   235    235     $(TOP)/src/mutex_noop.c \
   236    236     $(TOP)/src/mutex_unix.c \
   237    237     $(TOP)/src/mutex_w32.c \
   238    238     $(TOP)/src/notify.c \
   239    239     $(TOP)/src/os.c \
   240    240     $(TOP)/src/os.h \
   241    241     $(TOP)/src/os_common.h \
          242  +  $(TOP)/src/os_setup.h \
   242    243     $(TOP)/src/os_unix.c \
   243    244     $(TOP)/src/os_win.c \
          245  +  $(TOP)/src/os_win.h \
   244    246     $(TOP)/src/pager.c \
   245    247     $(TOP)/src/pager.h \
   246    248     $(TOP)/src/parse.y \
   247    249     $(TOP)/src/pcache.c \
   248    250     $(TOP)/src/pcache.h \
   249    251     $(TOP)/src/pcache1.c \
   250    252     $(TOP)/src/pragma.c \
................................................................................
   453    455      $(TOP)/src/hash.h \
   454    456      $(TOP)/src/hwtime.h \
   455    457      keywordhash.h \
   456    458      $(TOP)/src/mutex.h \
   457    459      opcodes.h \
   458    460      $(TOP)/src/os.h \
   459    461      $(TOP)/src/os_common.h \
          462  +   $(TOP)/src/os_setup.h \
          463  +   $(TOP)/src/os_win.h \
   460    464      $(TOP)/src/pager.h \
   461    465      $(TOP)/src/pcache.h \
   462    466      parse.h  \
   463    467      sqlite3.h  \
   464    468      $(TOP)/src/sqlite3ext.h \
   465    469      $(TOP)/src/sqliteInt.h  \
   466    470      $(TOP)/src/sqliteLimit.h \

Changes to Makefile.msc.

   633    633     $(TOP)\src\mutex_noop.c \
   634    634     $(TOP)\src\mutex_unix.c \
   635    635     $(TOP)\src\mutex_w32.c \
   636    636     $(TOP)\src\notify.c \
   637    637     $(TOP)\src\os.c \
   638    638     $(TOP)\src\os.h \
   639    639     $(TOP)\src\os_common.h \
          640  +  $(TOP)\src\os_setup.h \
   640    641     $(TOP)\src\os_unix.c \
   641    642     $(TOP)\src\os_win.c \
          643  +  $(TOP)\src\os_win.h \
   642    644     $(TOP)\src\pager.c \
   643    645     $(TOP)\src\pager.h \
   644    646     $(TOP)\src\parse.y \
   645    647     $(TOP)\src\pcache.c \
   646    648     $(TOP)\src\pcache.h \
   647    649     $(TOP)\src\pcache1.c \
   648    650     $(TOP)\src\pragma.c \
................................................................................
   854    856      $(TOP)\src\hash.h \
   855    857      $(TOP)\src\hwtime.h \
   856    858      keywordhash.h \
   857    859      $(TOP)\src\mutex.h \
   858    860      opcodes.h \
   859    861      $(TOP)\src\os.h \
   860    862      $(TOP)\src\os_common.h \
          863  +   $(TOP)\src\os_setup.h \
          864  +   $(TOP)\src\os_win.h \
   861    865      $(TOP)\src\pager.h \
   862    866      $(TOP)\src\pcache.h \
   863    867      parse.h \
   864    868      sqlite3.h \
   865    869      $(TOP)\src\sqlite3ext.h \
   866    870      $(TOP)\src\sqliteInt.h \
   867    871      $(TOP)\src\sqliteLimit.h \

Changes to Makefile.vxworks.

   258    258     $(TOP)/src/mutex_noop.c \
   259    259     $(TOP)/src/mutex_unix.c \
   260    260     $(TOP)/src/mutex_w32.c \
   261    261     $(TOP)/src/notify.c \
   262    262     $(TOP)/src/os.c \
   263    263     $(TOP)/src/os.h \
   264    264     $(TOP)/src/os_common.h \
          265  +  $(TOP)/src/os_setup.h \
   265    266     $(TOP)/src/os_unix.c \
   266    267     $(TOP)/src/os_win.c \
          268  +  $(TOP)/src/os_win.h \
   267    269     $(TOP)/src/pager.c \
   268    270     $(TOP)/src/pager.h \
   269    271     $(TOP)/src/parse.y \
   270    272     $(TOP)/src/pcache.c \
   271    273     $(TOP)/src/pcache.h \
   272    274     $(TOP)/src/pcache1.c \
   273    275     $(TOP)/src/pragma.c \
................................................................................
   412    414      $(TOP)/src/hash.h \
   413    415      $(TOP)/src/hwtime.h \
   414    416      keywordhash.h \
   415    417      $(TOP)/src/mutex.h \
   416    418      opcodes.h \
   417    419      $(TOP)/src/os.h \
   418    420      $(TOP)/src/os_common.h \
          421  +   $(TOP)/src/os_setup.h \
          422  +   $(TOP)/src/os_win.h \
   419    423      $(TOP)/src/pager.h \
   420    424      $(TOP)/src/pcache.h \
   421    425      parse.h  \
   422    426      sqlite3.h  \
   423    427      $(TOP)/src/sqlite3ext.h \
   424    428      $(TOP)/src/sqliteInt.h  \
   425    429      $(TOP)/src/sqliteLimit.h \

Changes to main.mk.

   117    117     $(TOP)/src/mutex_noop.c \
   118    118     $(TOP)/src/mutex_unix.c \
   119    119     $(TOP)/src/mutex_w32.c \
   120    120     $(TOP)/src/notify.c \
   121    121     $(TOP)/src/os.c \
   122    122     $(TOP)/src/os.h \
   123    123     $(TOP)/src/os_common.h \
          124  +  $(TOP)/src/os_setup.h \
   124    125     $(TOP)/src/os_unix.c \
   125    126     $(TOP)/src/os_win.c \
          127  +  $(TOP)/src/os_win.h \
   126    128     $(TOP)/src/pager.c \
   127    129     $(TOP)/src/pager.h \
   128    130     $(TOP)/src/parse.y \
   129    131     $(TOP)/src/pcache.c \
   130    132     $(TOP)/src/pcache.h \
   131    133     $(TOP)/src/pcache1.c \
   132    134     $(TOP)/src/pragma.c \
................................................................................
   335    337      $(TOP)/src/hash.h \
   336    338      $(TOP)/src/hwtime.h \
   337    339      keywordhash.h \
   338    340      $(TOP)/src/mutex.h \
   339    341      opcodes.h \
   340    342      $(TOP)/src/os.h \
   341    343      $(TOP)/src/os_common.h \
          344  +   $(TOP)/src/os_setup.h \
          345  +   $(TOP)/src/os_win.h \
   342    346      $(TOP)/src/pager.h \
   343    347      $(TOP)/src/pcache.h \
   344    348      parse.h  \
   345    349      sqlite3.h  \
   346    350      $(TOP)/src/sqlite3ext.h \
   347    351      $(TOP)/src/sqliteInt.h  \
   348    352      $(TOP)/src/sqliteLimit.h \

Changes to src/mutex_w32.c.

    15     15   
    16     16   /*
    17     17   ** The code in this file is only used if we are compiling multithreaded
    18     18   ** on a win32 system.
    19     19   */
    20     20   #ifdef SQLITE_MUTEX_W32
    21     21   
           22  +/*
           23  +** Include the header file for the Windows VFS.
           24  +*/
           25  +#include "os_win.h"
           26  +
    22     27   /*
    23     28   ** Each recursive mutex is an instance of the following structure.
    24     29   */
    25     30   struct sqlite3_mutex {
    26     31     CRITICAL_SECTION mutex;    /* Mutex controlling the lock */
    27     32     int id;                    /* Mutex type */
    28     33   #ifdef SQLITE_DEBUG

Changes to src/os.h.

    17     17   ** This header file is #include-ed by sqliteInt.h and thus ends up
    18     18   ** being included by every source file.
    19     19   */
    20     20   #ifndef _SQLITE_OS_H_
    21     21   #define _SQLITE_OS_H_
    22     22   
    23     23   /*
    24         -** Figure out if we are dealing with Unix, Windows, or some other
    25         -** operating system.  After the following block of preprocess macros,
    26         -** all of SQLITE_OS_UNIX, SQLITE_OS_WIN, and SQLITE_OS_OTHER 
    27         -** will defined to either 1 or 0.  One of the four will be 1.  The other 
    28         -** three will be 0.
           24  +** Attempt to automatically detect the operating system and setup the
           25  +** necessary pre-processor macros for it.
    29     26   */
    30         -#if defined(SQLITE_OS_OTHER)
    31         -# if SQLITE_OS_OTHER==1
    32         -#   undef SQLITE_OS_UNIX
    33         -#   define SQLITE_OS_UNIX 0
    34         -#   undef SQLITE_OS_WIN
    35         -#   define SQLITE_OS_WIN 0
    36         -# else
    37         -#   undef SQLITE_OS_OTHER
    38         -# endif
    39         -#endif
    40         -#if !defined(SQLITE_OS_UNIX) && !defined(SQLITE_OS_OTHER)
    41         -# define SQLITE_OS_OTHER 0
    42         -# ifndef SQLITE_OS_WIN
    43         -#   if defined(_WIN32) || defined(WIN32) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__BORLANDC__)
    44         -#     define SQLITE_OS_WIN 1
    45         -#     define SQLITE_OS_UNIX 0
    46         -#   else
    47         -#     define SQLITE_OS_WIN 0
    48         -#     define SQLITE_OS_UNIX 1
    49         -#  endif
    50         -# else
    51         -#  define SQLITE_OS_UNIX 0
    52         -# endif
    53         -#else
    54         -# ifndef SQLITE_OS_WIN
    55         -#  define SQLITE_OS_WIN 0
    56         -# endif
    57         -#endif
    58         -
    59         -#if SQLITE_OS_WIN
    60         -# include <windows.h>
    61         -#endif
    62         -
    63         -/*
    64         -** Determine if we are dealing with Windows NT.
    65         -**
    66         -** We ought to be able to determine if we are compiling for win98 or winNT
    67         -** using the _WIN32_WINNT macro as follows:
    68         -**
    69         -** #if defined(_WIN32_WINNT)
    70         -** # define SQLITE_OS_WINNT 1
    71         -** #else
    72         -** # define SQLITE_OS_WINNT 0
    73         -** #endif
    74         -**
    75         -** However, vs2005 does not set _WIN32_WINNT by default, as it ought to,
    76         -** so the above test does not work.  We'll just assume that everything is
    77         -** winNT unless the programmer explicitly says otherwise by setting
    78         -** SQLITE_OS_WINNT to 0.
    79         -*/
    80         -#if SQLITE_OS_WIN && !defined(SQLITE_OS_WINNT)
    81         -# define SQLITE_OS_WINNT 1
    82         -#endif
    83         -
    84         -/*
    85         -** Determine if we are dealing with WindowsCE - which has a much
    86         -** reduced API.
    87         -*/
    88         -#if defined(_WIN32_WCE)
    89         -# define SQLITE_OS_WINCE 1
    90         -#else
    91         -# define SQLITE_OS_WINCE 0
    92         -#endif
    93         -
    94         -/*
    95         -** Determine if we are dealing with WinRT, which provides only a subset of
    96         -** the full Win32 API.
    97         -*/
    98         -#if !defined(SQLITE_OS_WINRT)
    99         -# define SQLITE_OS_WINRT 0
   100         -#endif
           27  +#include "os_setup.h"
   101     28   
   102     29   /* If the SET_FULLSYNC macro is not defined above, then make it
   103     30   ** a no-op
   104     31   */
   105     32   #ifndef SET_FULLSYNC
   106     33   # define SET_FULLSYNC(x,y)
   107     34   #endif

Added src/os_setup.h.

            1  +/*
            2  +** 2013 November 25
            3  +**
            4  +** The author disclaims copyright to this source code.  In place of
            5  +** a legal notice, here is a blessing:
            6  +**
            7  +**    May you do good and not evil.
            8  +**    May you find forgiveness for yourself and forgive others.
            9  +**    May you share freely, never taking more than you give.
           10  +**
           11  +******************************************************************************
           12  +**
           13  +** This file contains pre-processor directives related to operating system
           14  +** detection and/or setup.
           15  +*/
           16  +#ifndef _OS_SETUP_H_
           17  +#define _OS_SETUP_H_
           18  +
           19  +/*
           20  +** Figure out if we are dealing with Unix, Windows, or some other operating
           21  +** system.
           22  +**
           23  +** After the following block of preprocess macros, all of SQLITE_OS_UNIX,
           24  +** SQLITE_OS_WIN, and SQLITE_OS_OTHER will defined to either 1 or 0.  One of
           25  +** the three will be 1.  The other two will be 0.
           26  +*/
           27  +#if defined(SQLITE_OS_OTHER)
           28  +#  if SQLITE_OS_OTHER==1
           29  +#    undef SQLITE_OS_UNIX
           30  +#    define SQLITE_OS_UNIX 0
           31  +#    undef SQLITE_OS_WIN
           32  +#    define SQLITE_OS_WIN 0
           33  +#  else
           34  +#    undef SQLITE_OS_OTHER
           35  +#  endif
           36  +#endif
           37  +#if !defined(SQLITE_OS_UNIX) && !defined(SQLITE_OS_OTHER)
           38  +#  define SQLITE_OS_OTHER 0
           39  +#  ifndef SQLITE_OS_WIN
           40  +#    if defined(_WIN32) || defined(WIN32) || defined(__CYGWIN__) || \
           41  +        defined(__MINGW32__) || defined(__BORLANDC__)
           42  +#      define SQLITE_OS_WIN 1
           43  +#      define SQLITE_OS_UNIX 0
           44  +#    else
           45  +#      define SQLITE_OS_WIN 0
           46  +#      define SQLITE_OS_UNIX 1
           47  +#    endif
           48  +#  else
           49  +#    define SQLITE_OS_UNIX 0
           50  +#  endif
           51  +#else
           52  +#  ifndef SQLITE_OS_WIN
           53  +#    define SQLITE_OS_WIN 0
           54  +#  endif
           55  +#endif
           56  +
           57  +#endif /* _OS_SETUP_H_ */

Changes to src/os_win.c.

    11     11   ******************************************************************************
    12     12   **
    13     13   ** This file contains code that is specific to Windows.
    14     14   */
    15     15   #include "sqliteInt.h"
    16     16   #if SQLITE_OS_WIN               /* This file is used for Windows only */
    17     17   
    18         -#ifdef __CYGWIN__
    19         -# include <sys/cygwin.h>
    20         -# include <errno.h> /* amalgamator: keep */
    21         -#endif
    22         -
    23     18   /*
    24     19   ** Include code that is common to all os_*.c files
    25     20   */
    26     21   #include "os_common.h"
    27     22   
           23  +/*
           24  +** Include the header file for the Windows VFS.
           25  +*/
           26  +#include "os_win.h"
           27  +
    28     28   /*
    29     29   ** Compiling and using WAL mode requires several APIs that are only
    30     30   ** available in Windows platforms based on the NT kernel.
    31     31   */
    32     32   #if !SQLITE_OS_WINNT && !defined(SQLITE_OMIT_WAL)
    33     33   #  error "WAL mode requires support from the Windows NT kernel, compile\
    34     34    with SQLITE_OMIT_WAL."

Added src/os_win.h.

            1  +/*
            2  +** 2013 November 25
            3  +**
            4  +** The author disclaims copyright to this source code.  In place of
            5  +** a legal notice, here is a blessing:
            6  +**
            7  +**    May you do good and not evil.
            8  +**    May you find forgiveness for yourself and forgive others.
            9  +**    May you share freely, never taking more than you give.
           10  +**
           11  +******************************************************************************
           12  +**
           13  +** This file contains code that is specific to Windows.
           14  +*/
           15  +#ifndef _OS_WIN_H_
           16  +#define _OS_WIN_H_
           17  +
           18  +/*
           19  +** Include the primary Windows SDK header file.
           20  +*/
           21  +#include "windows.h"
           22  +
           23  +#ifdef __CYGWIN__
           24  +# include <sys/cygwin.h>
           25  +# include <errno.h> /* amalgamator: keep */
           26  +#endif
           27  +
           28  +/*
           29  +** Determine if we are dealing with Windows NT.
           30  +**
           31  +** We ought to be able to determine if we are compiling for Windows 9x or
           32  +** Windows NT using the _WIN32_WINNT macro as follows:
           33  +**
           34  +** #if defined(_WIN32_WINNT)
           35  +** # define SQLITE_OS_WINNT 1
           36  +** #else
           37  +** # define SQLITE_OS_WINNT 0
           38  +** #endif
           39  +**
           40  +** However, Visual Studio 2005 does not set _WIN32_WINNT by default, as
           41  +** it ought to, so the above test does not work.  We'll just assume that
           42  +** everything is Windows NT unless the programmer explicitly says otherwise
           43  +** by setting SQLITE_OS_WINNT to 0.
           44  +*/
           45  +#if SQLITE_OS_WIN && !defined(SQLITE_OS_WINNT)
           46  +# define SQLITE_OS_WINNT 1
           47  +#endif
           48  +
           49  +/*
           50  +** Determine if we are dealing with Windows CE - which has a much reduced
           51  +** API.
           52  +*/
           53  +#if defined(_WIN32_WCE)
           54  +# define SQLITE_OS_WINCE 1
           55  +#else
           56  +# define SQLITE_OS_WINCE 0
           57  +#endif
           58  +
           59  +/*
           60  +** Determine if we are dealing with WinRT, which provides only a subset of
           61  +** the full Win32 API.
           62  +*/
           63  +#if !defined(SQLITE_OS_WINRT)
           64  +# define SQLITE_OS_WINRT 0
           65  +#endif
           66  +
           67  +#endif /* _OS_WIN_H_ */

Changes to src/test1.c.

    10     10   **
    11     11   *************************************************************************
    12     12   ** Code for testing all sorts of SQLite interfaces.  This code
    13     13   ** is not included in the SQLite library.  It is used for automated
    14     14   ** testing of the SQLite library.
    15     15   */
    16     16   #include "sqliteInt.h"
           17  +#if SQLITE_OS_WIN
           18  +#  include "os_win.h"
           19  +#endif
           20  +
    17     21   #include "vdbeInt.h"
    18     22   #include "tcl.h"
    19     23   #include <stdlib.h>
    20     24   #include <string.h>
    21     25   
    22     26   /*
    23     27   ** This is a copy of the first part of the SqliteDb structure in 

Changes to src/test_config.c.

    16     16   ** The focus of this file is providing the TCL testing layer
    17     17   ** access to compile-time constants.
    18     18   */
    19     19   
    20     20   #include "sqliteLimit.h"
    21     21   
    22     22   #include "sqliteInt.h"
           23  +#if SQLITE_OS_WIN
           24  +#  include "os_win.h"
           25  +#endif
           26  +
    23     27   #include "tcl.h"
    24     28   #include <stdlib.h>
    25     29   #include <string.h>
    26     30   
    27     31   /*
    28     32   ** Macro to stringify the results of the evaluation a pre-processor
    29     33   ** macro. i.e. so that STRINGVALUE(SQLITE_NOMEM) -> "7".

Changes to src/test_osinst.c.

    66     66   **         rc       INTEGER,          // Return value
    67     67   **         size     INTEGER,          // Bytes read or written
    68     68   **         offset   INTEGER           // File offset read or written
    69     69   **       );
    70     70   */
    71     71   
    72     72   #include "sqlite3.h"
           73  +
           74  +#include "os_setup.h"
           75  +#if SQLITE_OS_WIN
           76  +#  include "os_win.h"
           77  +#endif
           78  +
    73     79   #include <string.h>
    74     80   #include <assert.h>
    75     81   
    76     82   
    77     83   /*
    78     84   ** Maximum pathname length supported by the vfslog backend.
    79     85   */
................................................................................
   217    223   #include <sys/time.h>
   218    224   static sqlite3_uint64 vfslog_time(){
   219    225     struct timeval sTime;
   220    226     gettimeofday(&sTime, 0);
   221    227     return sTime.tv_usec + (sqlite3_uint64)sTime.tv_sec * 1000000;
   222    228   }
   223    229   #elif SQLITE_OS_WIN
   224         -#include <windows.h>
   225    230   #include <time.h>
   226    231   static sqlite3_uint64 vfslog_time(){
   227    232     FILETIME ft;
   228    233     sqlite3_uint64 u64time = 0;
   229    234    
   230    235     GetSystemTimeAsFileTime(&ft);
   231    236   

Changes to src/test_quota.c.

    40     40   #define sqlite3_mutex_enter(X)
    41     41   #define sqlite3_mutex_try(X)      SQLITE_OK
    42     42   #define sqlite3_mutex_leave(X)
    43     43   #define sqlite3_mutex_held(X)     ((void)(X),1)
    44     44   #define sqlite3_mutex_notheld(X)  ((void)(X),1)
    45     45   #endif /* SQLITE_THREADSAFE==0 */
    46     46   
    47         -
    48         -/*
    49         -** Figure out if we are dealing with Unix, Windows, or some other
    50         -** operating system.  After the following block of preprocess macros,
    51         -** all of SQLITE_OS_UNIX, SQLITE_OS_WIN, and SQLITE_OS_OTHER 
    52         -** will defined to either 1 or 0.  One of the four will be 1.  The other 
    53         -** three will be 0.
    54         -*/
    55         -#if defined(SQLITE_OS_OTHER)
    56         -# if SQLITE_OS_OTHER==1
    57         -#   undef SQLITE_OS_UNIX
    58         -#   define SQLITE_OS_UNIX 0
    59         -#   undef SQLITE_OS_WIN
    60         -#   define SQLITE_OS_WIN 0
    61         -# else
    62         -#   undef SQLITE_OS_OTHER
    63         -# endif
    64         -#endif
    65         -#if !defined(SQLITE_OS_UNIX) && !defined(SQLITE_OS_OTHER)
    66         -# define SQLITE_OS_OTHER 0
    67         -# ifndef SQLITE_OS_WIN
    68         -#   if defined(_WIN32) || defined(WIN32) || defined(__CYGWIN__) \
    69         -                       || defined(__MINGW32__) || defined(__BORLANDC__)
    70         -#     define SQLITE_OS_WIN 1
    71         -#     define SQLITE_OS_UNIX 0
    72         -#   else
    73         -#     define SQLITE_OS_WIN 0
    74         -#     define SQLITE_OS_UNIX 1
    75         -#  endif
    76         -# else
    77         -#  define SQLITE_OS_UNIX 0
    78         -# endif
    79         -#else
    80         -# ifndef SQLITE_OS_WIN
    81         -#  define SQLITE_OS_WIN 0
    82         -# endif
    83         -#endif
           47  +#include "os_setup.h"
    84     48   
    85     49   #if SQLITE_OS_UNIX
    86     50   # include <unistd.h>
    87     51   #endif
    88     52   #if SQLITE_OS_WIN
    89         -# include <windows.h>
           53  +# include "os_win.h"
    90     54   # include <io.h>
    91     55   #endif
    92     56   
    93     57   
    94     58   /************************ Object Definitions ******************************/
    95     59   
    96     60   /* Forward declaration of all object types */

Changes to src/test_quota.h.

    27     27   ** continues as if nothing had happened.
    28     28   */
    29     29   #ifndef _QUOTA_H_
    30     30   #include "sqlite3.h"
    31     31   #include <stdio.h>
    32     32   #include <sys/types.h>
    33     33   #include <sys/stat.h>
    34         -#if SQLITE_OS_UNIX
    35         -# include <unistd.h>
    36         -#endif
    37         -#if SQLITE_OS_WIN
    38         -# include <windows.h>
    39         -#endif
    40     34   
    41     35   /* Make this callable from C++ */
    42     36   #ifdef __cplusplus
    43     37   extern "C" {
    44     38   #endif
    45     39   
    46     40   /*

Changes to tool/mksqlite3c-noext.tcl.

    95     95      btreeInt.h
    96     96      hash.h
    97     97      hwtime.h
    98     98      keywordhash.h
    99     99      mutex.h
   100    100      opcodes.h
   101    101      os_common.h
          102  +   os_setup.h
          103  +   os_win.h
   102    104      os.h
   103    105      pager.h
   104    106      parse.h
   105    107      pcache.h
   106    108      sqlite3ext.h
   107    109      sqlite3.h
   108    110      sqliteicu.h

Changes to tool/mksqlite3c.tcl.

    99     99      fts3_tokenizer.h
   100    100      hash.h
   101    101      hwtime.h
   102    102      keywordhash.h
   103    103      mutex.h
   104    104      opcodes.h
   105    105      os_common.h
          106  +   os_setup.h
          107  +   os_win.h
   106    108      os.h
   107    109      pager.h
   108    110      parse.h
   109    111      pcache.h
   110    112      rtree.h
   111    113      sqlite3ext.h
   112    114      sqlite3.h

Changes to tool/mksqlite3internalh.tcl.

    56     56      btree.h
    57     57      btreeInt.h
    58     58      hash.h
    59     59      hwtime.h
    60     60      keywordhash.h
    61     61      opcodes.h
    62     62      os_common.h
           63  +   os_setup.h
           64  +   os_win.h
    63     65      os.h
    64     66      pager.h
    65     67      parse.h
    66     68      sqlite3ext.h
    67     69      sqlite3.h
    68     70      sqliteInt.h
    69     71      sqliteLimit.h