/ Check-in [9ee5686a]
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:Changes to enable compiling using VC6.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 9ee5686ab3b0bca8cabdf455c75bd9410cdc5378
User & Date: drh 2014-10-10 18:09:52
Context
2014-10-10
19:10
Fix a failing test case in index5.test. Also tweak the way cache memory is divided between read-only and dirty pages when using SQLITE_CONFIG_PAGECACHE to reduce IO in some cases. check-in: 8541dfb3 user: dan tags: trunk
18:09
Changes to enable compiling using VC6. check-in: 9ee5686a user: drh tags: trunk
17:47
When using the -config option to releasetest.tcl, default the testing type to "fulltest" if it is not specified on the command line. check-in: cf291cbe user: drh tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/sqliteInt.h.

   155    155   
   156    156   /*
   157    157   ** A macro to hint to the compiler that a function should not be
   158    158   ** inlined.
   159    159   */
   160    160   #if defined(__GNUC__)
   161    161   #  define SQLITE_NOINLINE  __attribute__((noinline))
   162         -#elif defined(_MSC_VER)
          162  +#elif defined(_MSC_VER) && _MSC_VER>=1310
   163    163   #  define SQLITE_NOINLINE  __declspec(noinline)
   164    164   #else
   165    165   #  define SQLITE_NOINLINE
   166    166   #endif
   167    167   
   168    168   /*
   169    169   ** The SQLITE_THREADSAFE macro must be defined as 0, 1, or 2.

Changes to src/threads.c.

   101    101   #if SQLITE_OS_WIN && !SQLITE_OS_WINRT && SQLITE_THREADSAFE>0
   102    102   
   103    103   #define SQLITE_THREADS_IMPLEMENTED 1  /* Prevent the single-thread code below */
   104    104   #include <process.h>
   105    105   
   106    106   /* A running thread */
   107    107   struct SQLiteThread {
   108         -  uintptr_t tid;           /* The thread handle */
          108  +  void *tid;               /* The thread handle */
   109    109     unsigned id;             /* The thread identifier */
   110    110     void *(*xTask)(void*);   /* The routine to run as a thread */
   111    111     void *pIn;               /* Argument to xTask */
   112    112     void *pResult;           /* Result of xTask */
   113    113   };
   114    114   
   115    115   /* Thread procedure Win32 compatibility shim */
................................................................................
   149    149     p = sqlite3Malloc(sizeof(*p));
   150    150     if( p==0 ) return SQLITE_NOMEM;
   151    151     if( sqlite3GlobalConfig.bCoreMutex==0 ){
   152    152       memset(p, 0, sizeof(*p));
   153    153     }else{
   154    154       p->xTask = xTask;
   155    155       p->pIn = pIn;
   156         -    p->tid = _beginthreadex(0, 0, sqlite3ThreadProc, p, 0, &p->id);
          156  +    p->tid = (void*)_beginthreadex(0, 0, sqlite3ThreadProc, p, 0, &p->id);
   157    157       if( p->tid==0 ){
   158    158         memset(p, 0, sizeof(*p));
   159    159       }
   160    160     }
   161    161     if( p->xTask==0 ){
   162    162       p->id = GetCurrentThreadId();
   163    163       p->pResult = xTask(pIn);