SQLite: Check-in [3702a31e]

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

Overview

Comment:	The Windows OS flavor #ifdefs must be performed after the 'windows.h' file has been included.
Downloads:	Tarball \| ZIP archive \| SQL archive
Timelines:	family \| ancestors \| descendants \| both \| trunk
Files:	files \| file ages \| folders
SHA1:	3702a31e56fe02d14ce246109b318a124cad9f1a
User & Date:	mistachkin 2011-12-09 05:52:16

Context

2011-12-09
13:24		Modify the OP_Once opcode so that it works correctly in trigger sub-programs. This is a candidate fix for [7bbfb7d442]. (check-in: 557c6905 user: dan tags: trunk)
05:52		The Windows OS flavor #ifdefs must be performed after the 'windows.h' file has been included. (check-in: 3702a31e user: mistachkin tags: trunk)
2011-12-08
20:41		Hand merge the zone allocator for MacOS from the apple-osx branch. (check-in: 0d955c20 user: drh tags: trunk)

Changes

Hide Diffs Side-by-Side Diffs Show Whitespace Changes Patch

Changes to src/os.h.

    60     60   #  define SQLITE_OS_OS2 0
    61     61   # endif
    62     62   #else
    63     63   # ifndef SQLITE_OS_WIN
    64     64   #  define SQLITE_OS_WIN 0
    65     65   # endif
    66     66   #endif
    67         -
    68         -/*
    69         -** Determine if we are dealing with Windows NT.
    70         -*/
    71         -#if defined(_WIN32_WINNT)
    72         -# define SQLITE_OS_WINNT 1
    73         -#else
    74         -# define SQLITE_OS_WINNT 0
    75         -#endif
    76         -
    77         -/*
    78         -** Determine if we are dealing with WindowsCE - which has a much
    79         -** reduced API.
    80         -*/
    81         -#if defined(_WIN32_WCE)
    82         -# define SQLITE_OS_WINCE 1
    83         -#else
    84         -# define SQLITE_OS_WINCE 0
    85         -#endif
    86         -
    87     67   
    88     68   /*
    89     69   ** Define the maximum size of a temporary filename
    90     70   */
    91     71   #if SQLITE_OS_WIN
    92     72   # include <windows.h>
    93     73   # define SQLITE_TEMPNAME_SIZE (MAX_PATH+50)
................................................................................
   105     85   # include <os2.h>
   106     86   # include <uconv.h>
   107     87   # define SQLITE_TEMPNAME_SIZE (CCHMAXPATHCOMP)
   108     88   #else
   109     89   # define SQLITE_TEMPNAME_SIZE 200
   110     90   #endif
   111     91   
           92  +/*
           93  +** Determine if we are dealing with Windows NT.
           94  +*/
           95  +#if defined(_WIN32_WINNT)
           96  +# define SQLITE_OS_WINNT 1
           97  +#else
           98  +# define SQLITE_OS_WINNT 0
           99  +#endif
          100  +
          101  +/*
          102  +** Determine if we are dealing with WindowsCE - which has a much
          103  +** reduced API.
          104  +*/
          105  +#if defined(_WIN32_WCE)
          106  +# define SQLITE_OS_WINCE 1
          107  +#else
          108  +# define SQLITE_OS_WINCE 0
          109  +#endif
          110  +
   112    111   /* If the SET_FULLSYNC macro is not defined above, then make it
   113    112   ** a no-op
   114    113   */
   115    114   #ifndef SET_FULLSYNC
   116    115   # define SET_FULLSYNC(x,y)
   117    116   #endif
   118    117