/ Check-in [c2e0b790]
Login

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

Overview
Comment:One more change before 2.4.2: Make the os.h header file more robust in detecting whether to use unix or windows. (CVS 434)
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: c2e0b79057c9c643e7432e62c90399c8f34339f9
User & Date: drh 2002-03-20 00:00:29
Context
2002-03-20
01:05
Version 2.4.2 (CVS 441) check-in: 49d03232 user: drh tags: trunk
00:00
One more change before 2.4.2: Make the os.h header file more robust in detecting whether to use unix or windows. (CVS 434) check-in: c2e0b790 user: drh tags: trunk
2002-03-19
23:51
Version 2.4.2 (CVS 433) check-in: b0805b60 user: drh tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/os.c.

    13     13   ** This file contains code that is specific to particular operating
    14     14   ** systems.  The purpose of this file is to provide a uniform abstraction
    15     15   ** on which the rest of SQLite can operate.
    16     16   */
    17     17   #include "sqliteInt.h"
    18     18   #include "os.h"
    19     19   
    20         -#ifndef OS_UNIX
    21         -# ifndef OS_WIN
    22         -#  if defined(_WIN32) || defined(WIN32) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__BORLANDC__)
    23         -#    define OS_WIN 1
    24         -#    define OS_UNIX 0
    25         -#  else
    26         -#    define OS_WIN 0
    27         -#    define OS_UNIX 1
    28         -#  endif
    29         -# else
    30         -#  define OS_UNIX 0
    31         -# endif
    32         -#endif
    33         -#ifndef OS_WIN
    34         -# define OS_WIN 0
    35         -#endif
    36     20   #if OS_UNIX
    37     21   # include <unistd.h>
    38     22   # include <fcntl.h>
    39     23   # include <sys/stat.h>
    40     24   # include <time.h>
    41     25   #endif
    42     26   #if OS_WIN

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   #ifndef _SQLITE_OS_H_
    18     18   #define _SQLITE_OS_H_
    19     19   
    20         -#ifdef WIN32
    21         -#  define OS_WIN 1
    22         -#  undef  OS_UNIX
    23         -#else
    24         -#  define OS_UNIX 1
    25         -#  undef  OS_WIN
           20  +#ifndef OS_UNIX
           21  +# ifndef OS_WIN
           22  +#  if defined(_WIN32) || defined(WIN32) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__BORLANDC__)
           23  +#    define OS_WIN 1
           24  +#    define OS_UNIX 0
           25  +#  else
           26  +#    define OS_WIN 0
           27  +#    define OS_UNIX 1
           28  +#  endif
           29  +# else
           30  +#  define OS_UNIX 0
           31  +# endif
           32  +#endif
           33  +#ifndef OS_WIN
           34  +# define OS_WIN 0
    26     35   #endif
    27     36   
    28     37   /*
    29     38   ** A handle for an open file is stored in an OsFile object.
    30     39   */
    31     40   #if OS_UNIX
    32     41     typedef struct OsFile OsFile;

Changes to www/changes.tcl.

    18     18   }
    19     19   
    20     20   chng {2002 Mar 14 (2.4.2)} {
    21     21   <li>Bug fix: Fix an assertion failure that occurred when ROWID was a column
    22     22       in a SELECT statement on a view.</li>
    23     23   <li>Bug fix: Fix an uninitialized variable in the VDBE that would could an
    24     24       assert failure.</li>
           25  +<li>Make the os.h header file more robust in detecting when the compile is
           26  +    for windows and when it is for unix.</li>
    25     27   }
    26     28   
    27     29   chng {2002 Mar 13 (2.4.1)} {
    28     30   <li>Using an unnamed subquery in a FROM clause would cause a segfault.</li>
    29     31   <li>The parser now insists on seeing a semicolon or the end of input before
    30     32       executing a statement.  This avoids an accidental disaster if the
    31     33       WHERE keyword is misspelled in an UPDATE or DELETE statement.</li>