/ Check-in [ad6a782e]
Login

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

Overview
Comment:Moved check and define for OS_WINCE from os_win.c to os.h (with the other OS_* defines). This allows OS_WINCE to be available for mutex_w32.c which is included earlier than os_win.c in the almagamation. (CVS 5176)
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: ad6a782e7c408f6c3ebff5f2715c629b75c8002d
User & Date: shane 2008-05-29 03:54:27
Context
2008-05-29
05:23
Fix cosmetic issues spotted while working on ticket #3146 (CVS 5177) check-in: 5f6eab65 user: drh tags: trunk
03:54
Moved check and define for OS_WINCE from os_win.c to os.h (with the other OS_* defines). This allows OS_WINCE to be available for mutex_w32.c which is included earlier than os_win.c in the almagamation. (CVS 5176) check-in: ad6a782e user: shane tags: trunk
03:20
When initializing the sqlite_sequence entry for an AUTOINCREMENT table, make sure the value is an reasonable integer even if the initial insert failed. Ticket #3148. (CVS 5175) check-in: 7e684785 user: drh tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/os.h.

    13     13   ** This header file (together with is companion C source-code file
    14     14   ** "os.c") attempt to abstract the underlying operating system so that
    15     15   ** the SQLite library will work on both POSIX and windows systems.
    16     16   **
    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         -** $Id: os.h,v 1.100 2008/05/29 02:53:00 shane Exp $
           20  +** $Id: os.h,v 1.101 2008/05/29 03:54:27 shane Exp $
    21     21   */
    22     22   #ifndef _SQLITE_OS_H_
    23     23   #define _SQLITE_OS_H_
    24     24   
    25     25   /*
    26     26   ** Figure out if we are dealing with Unix, Windows, or some other
    27     27   ** operating system.  After the following block of preprocess macros,
................................................................................
    62     62   # endif
    63     63   #else
    64     64   # ifndef OS_WIN
    65     65   #  define OS_WIN 0
    66     66   # endif
    67     67   #endif
    68     68   
           69  +/*
           70  +** Determine if we are dealing with WindowsCE - which has a much
           71  +** reduced API.
           72  +*/
           73  +#if defined(_WIN32_WCE)
           74  +# define OS_WINCE 1
           75  +#else
           76  +# define OS_WINCE 0
           77  +#endif
    69     78   
    70     79   
    71     80   /*
    72     81   ** Define the maximum size of a temporary filename
    73     82   */
    74     83   #if OS_WIN
    75     84   # include <windows.h>

Changes to src/os_win.c.

     8      8   **    May you find forgiveness for yourself and forgive others.
     9      9   **    May you share freely, never taking more than you give.
    10     10   **
    11     11   ******************************************************************************
    12     12   **
    13     13   ** This file contains code that is specific to windows.
    14     14   **
    15         -** $Id: os_win.c,v 1.122 2008/05/16 04:51:55 danielk1977 Exp $
           15  +** $Id: os_win.c,v 1.123 2008/05/29 03:54:27 shane Exp $
    16     16   */
    17     17   #include "sqliteInt.h"
    18     18   #if OS_WIN               /* This file is used for windows only */
    19     19   
    20     20   
    21     21   /*
    22     22   ** A Note About Memory Allocation:
................................................................................
    62     62   */
    63     63   #include "os_common.h"
    64     64   
    65     65   /*
    66     66   ** Determine if we are dealing with WindowsCE - which has a much
    67     67   ** reduced API.
    68     68   */
    69         -#if defined(_WIN32_WCE)
    70         -# define OS_WINCE 1
           69  +#if defined(OS_WINCE)
    71     70   # define AreFileApisANSI() 1
    72         -#else
    73         -# define OS_WINCE 0
    74     71   #endif
    75     72   
    76     73   /*
    77     74   ** WinCE lacks native support for file locking so we have to fake it
    78     75   ** with some code of our own.
    79     76   */
    80     77   #if OS_WINCE