/ Check-in [23918680]
Login

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

Overview
Comment:#ifdef out unused static function mutexIsNT(). Ticket #3481. (CVS 5875)
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 239186804c7541abc512da33bba8f6fc7d24a374
User & Date: shane 2008-11-10 20:01:41
Context
2008-11-10
23:54
Fix the documentation of the SQLITE_FUNCTION authorizer code so that it agrees with how SQLite has always behaved. Ticket #3489. (CVS 5876) check-in: 806b6ed2 user: drh tags: trunk
20:01
#ifdef out unused static function mutexIsNT(). Ticket #3481. (CVS 5875) check-in: 23918680 user: shane tags: trunk
19:24
Updated comment in source. Ticket #3453. (CVS 5874) check-in: 83caa220 user: shane tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/mutex_w32.c.

     7      7   **    May you do good and not evil.
     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   ** This file contains the C functions that implement mutexes for win32
    13     13   **
    14         -** $Id: mutex_w32.c,v 1.11 2008/06/26 10:41:19 danielk1977 Exp $
           14  +** $Id: mutex_w32.c,v 1.12 2008/11/10 20:01:41 shane Exp $
    15     15   */
    16     16   #include "sqliteInt.h"
    17     17   
    18     18   /*
    19     19   ** The code in this file is only used if we are compiling multithreaded
    20     20   ** on a win32 system.
    21     21   */
................................................................................
    37     37   **
    38     38   ** Here is an interesting observation:  Win95, Win98, and WinME lack
    39     39   ** the LockFileEx() API.  But we can still statically link against that
    40     40   ** API as long as we don't call it win running Win95/98/ME.  A call to
    41     41   ** this routine is used to determine if the host is Win95/98/ME or
    42     42   ** WinNT/2K/XP so that we will know whether or not we can safely call
    43     43   ** the LockFileEx() API.
           44  +**
           45  +** mutexIsNT() is only used for the TryEnterCriticalSection() API call,
           46  +** which is only available if your application was compiled with 
           47  +** _WIN32_WINNT defined to a value >= 0x0400.  Currently, the only
           48  +** call to TryEnterCriticalSection() is #ifdef'ed out, so #ifdef 
           49  +** this out as well.
    44     50   */
           51  +#if 0
    45     52   #if SQLITE_OS_WINCE
    46     53   # define mutexIsNT()  (1)
    47     54   #else
    48     55     static int mutexIsNT(void){
    49     56       static int osType = 0;
    50     57       if( osType==0 ){
    51     58         OSVERSIONINFO sInfo;
................................................................................
    52     59         sInfo.dwOSVersionInfoSize = sizeof(sInfo);
    53     60         GetVersionEx(&sInfo);
    54     61         osType = sInfo.dwPlatformId==VER_PLATFORM_WIN32_NT ? 2 : 1;
    55     62       }
    56     63       return osType==2;
    57     64     }
    58     65   #endif /* SQLITE_OS_WINCE */
    59         -
           66  +#endif
    60     67   
    61     68   #ifdef SQLITE_DEBUG
    62     69   /*
    63     70   ** The sqlite3_mutex_held() and sqlite3_mutex_notheld() routine are
    64     71   ** intended for use only inside assert() statements.
    65     72   */
    66     73   static int winMutexHeld(sqlite3_mutex *p){